Skip to content
Browse files

Merge ../BroadcastAdmin/CMS/Kabelkrantadmin

Conflicts:
	message.php
	template-toevoegen.php
  • Loading branch information...
2 parents 39b8b28 + 6adf1a5 commit 107d6e8614ebec02b2fd0e4c7e231e6f1ffee56d @skinkie skinkie committed
Showing with 20 additions and 13 deletions.
  1. +0 −1 broadcast.php
  2. +1 −1 functions.php
  3. +2 −2 message.php
  4. +15 −7 template-toevoegen.php
  5. +2 −2 toevoegen.php
View
1 broadcast.php
@@ -76,7 +76,6 @@
if (!file_exists(CACHEDIR)) mkdir(CACHEDIR);
mkdir($tmpdirectory);
}
-
$out = array();
$batch = array();
foreach ($result as $entry) {
View
2 functions.php
@@ -289,7 +289,7 @@ function batchrender($dir, $width, $height, $playlist) {
$svgfile = $dir.'/'.$filename.'.svg';
$file = $dir.'/'.$filename.'.png';
- $cmd .= $svgfile.' --export-width='.$width.' --export-height='.$height.' --export-png='.$file.'\n';
+ $cmd .= $svgfile.' --export-width='.$width.' --export-height='.$height.' --export-png='.$file."\n";
}
$cmd .= 'quit';
shell_exec('echo "'.$cmd.'" | /usr/bin/inkscape --shell 2>&1 1>/dev/null');
View
4 message.php
@@ -4,7 +4,7 @@
define('NORESULT', 'Geen resultaten gevonden');
define('WELCOME', 'Kabelkrantadmin');
define('EMERG', 'NOODSITUATIE UITZENDING AAN');
-define('GENERATE', 'Genereren = Kopieeren');
+define('GENERATE', 'Verversen');
define('ADD', 'Toevoegen');
define('NEXTPER', 'Komende Periode');
define('START', 'Start');
@@ -13,7 +13,7 @@
define('LASTMOD', 'Laatste wijziging door');
define('VIEW', 'Toon');
define('UNDEFINED', 'undefined');
-define('GENERATEANDBROADCAST', 'Genereren = Kopieëren');
+define('GENERATEANDBROADCAST', 'Verversen');
define('EXAMPLE', 'Voorbeeld');
View
22 template-toevoegen.php
@@ -112,13 +112,21 @@
$stmt = $dbh->prepare('UPDATE content_category_image SET categoryid = :categoryid, title = :title, photo = :photo, width = :width, height = :height, x = :x, y = :y WHERE id = :id');
$stmt->bindParam(':id', $_SESSION['newtemplate']['activeid'], PDO::PARAM_INT);
}
- $stmt->bindParam(':categoryid', active('category', 'newtemplate'), PDO::PARAM_INT);
- $stmt->bindParam(':title', active('title', 'newtemplate'), PDO::PARAM_STR, 20);
- $stmt->bindParam(':photo', active('photo', 'newtemplate'), PDO::PARAM_STR, 100);
- $stmt->bindParam(':width', active('w', 'newtemplate'), PDO::PARAM_INT);
- $stmt->bindParam(':height', active('h', 'newtemplate'), PDO::PARAM_INT);
- $stmt->bindParam(':x', active('x', 'newtemplate'), PDO::PARAM_INT);
- $stmt->bindParam(':y', active('y', 'newtemplate'), PDO::PARAM_INT);
+ $category = active('category', 'newtemplate');
+ $title = active('title', 'newtemplate');
+ $photo = active('photo', 'newtemplate');
+ $width = active('w', 'newtemplate');
+ $height = active('height', 'newtemplate');
+ $left = active('x', 'newtemplate');
+ $top = active('y', 'newtemplate');
+
+ $stmt->bindParam(':categoryid', $category, PDO::PARAM_INT);
+ $stmt->bindParam(':title', $title, PDO::PARAM_STR, 20);
+ $stmt->bindParam(':photo', $photo, PDO::PARAM_STR, 100);
+ $stmt->bindParam(':width', $width, PDO::PARAM_INT);
+ $stmt->bindParam(':height', $height, PDO::PARAM_INT);
+ $stmt->bindParam(':x', $left, PDO::PARAM_INT);
+ $stmt->bindParam(':y', $top, PDO::PARAM_INT);
$stmt->execute();
$dbh->commit();
#header('Location: toevoegen.php');
View
4 toevoegen.php
@@ -50,7 +50,7 @@
}
}
- header('Location: '.$_SERVER['PHP_SELF']);
+ header('Location: toevoegen.php');
exit;
}
@@ -151,7 +151,7 @@
}
$dbh = null;
- header('Location: '.$_SERVER['PHP_SELF'].'?databaseid='.$_SESSION['document']['databaseid']);
+ header('Location: toevoegen.php?databaseid='.$_SESSION['document']['databaseid']);
exit;
}

0 comments on commit 107d6e8

Please sign in to comment.
Something went wrong with that request. Please try again.