Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Wijzigingen

  • Loading branch information...
commit 0afb5df7968eea5d5fd31c058bf5f664fe712740 1 parent 6debfc2
root authored
View
2  broadcast.php
@@ -198,7 +198,7 @@
exec('mv -u '.$tmpdirectory.'/*.html '.BROADCASTDIR.'/.');
exec('mv -u '.$tmpdirectory.'/*.jpg '.BROADCASTCACHEDIR.'/.');
exec('mv -u '.$tmpdirectory.'/*.png '.BROADCASTCACHEDIR.'/.');
- exec('ln -sf /home/tv/broadcast/'.date('Y-m-d', $now).'.smil /home/tv/broadcast.smil');
+ exec('ln -sf /home/tv/broadcast/'.date('Y-m-d', $now).'.smil /home/tv/broadcast/broadcast.smil');
// exec('/usr/bin/sudo -u broadcast ssh tv@'.REMOTEHOST.' ln -sf '.REMOTEDIR.'/'.date('Y-m-d', $now).'.smil broadcast.smil');
// exec('/usr/bin/sudo -u broadcast fusermount -u '.BROADCASTDIR);
View
4 config.php
@@ -1,4 +1,5 @@
<?php
+ define ('VERSION', '1.1.0');
define ('OWNER', 'MidvlietTV');
define ('ABSOLUTEDIR', '/var/www/kabelkrantadmin/htdocs');
define ('TEMPLATEDIR', ABSOLUTEDIR.'/xsl');
@@ -15,6 +16,9 @@
define ('DURATION', 23);
define ('REMOTEHOST', '127.0.0.1');
define ('REMOTEDIR', 'broadcast');
+/* define ('RESOLUTIONW', '720');
+ define ('RESOLUTIONH', '576');
+*/
define ('RESOLUTIONW', '1024');
define ('RESOLUTIONH', '768');
View
4 index.php
@@ -26,7 +26,7 @@
</head>
<body>
<?php if (EMERGENCY) echo EMERG.'<br /><br />'; ?>
- <?php echo WELCOME; ?><br />
+ <?php echo WELCOME.' '.VERSION.' - <i>'.SIGNEDINUSER.'</i>: <b>'.$_SERVER['PHP_AUTH_USER'].'</b>'; ?><br />
<table>
<tr>
@@ -73,7 +73,7 @@
$maxdate = $now - 172800;
/* hackje even netjes maken en laten zien dat je datum en tijd beheerst*/
- $search = 'content_run.eind > :maxdate';
+ $search = 'content_run.eind > :maxdate AND content_run.enabled = 1';
if (isset($_POST['search'])) {
$needle = '%'.strtolower($_POST['search']).'%';
View
6 message.php
@@ -2,11 +2,11 @@
define('YES', 'Ja');
define('NO', 'Nee');
define('NORESULT', 'Geen resultaten gevonden');
-define('WELCOME', 'Welkom op Kabelkrantadmin.');
+define('WELCOME', 'Kabelkrantadmin');
define('EMERG', 'NOODSITUATIE UITZENDING AAN');
define('GENERATE', 'Genereren = Kopieeren');
define('ADD', 'Toevoegen');
-define('NEXTPER', 'Overzicht');
+define('NEXTPER', 'Komende Periode');
define('START', 'Start');
define('UNTIL', 'Tot');
define('LENGTH', 'Duur');
@@ -47,4 +47,6 @@
define('TODAY', 'Vandaag');
+define('SIGNEDINUSER', 'Ingelogde gebruiker');
+
?>
View
2  toevoegen.php
@@ -8,7 +8,7 @@
$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
if (isset($_GET['databaseid']) && is_numeric($_GET['databaseid']) && $_GET['databaseid'] > 0) {
- $stmt = $dbh->prepare('SELECT template, category, duration, photo, title, content FROM content, content_text WHERE content.id=:databaseid AND content.id = content_text.contentid;');
+ $stmt = $dbh->prepare('SELECT template, category, duration, photo, title, content FROM content, content_text WHERE content.id=:databaseid AND content.id = content_text.contentid ORDER BY content_text.id;');
$stmt->bindParam(':databaseid', $_GET['databaseid'], PDO::PARAM_INT);
$stmt->execute();
$result = $stmt->fetchAll();
Please sign in to comment.
Something went wrong with that request. Please try again.