Skip to content

Got rid of a lot of notices and strict warnings #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caefer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Got rid of a lot of notices and strict warnings #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac6a22e
Switched from using stdClass objects to array and got rid of a whole …
caefer Apr 20, 2011
c3bbc47
Switched from using stdClass objects to array and got rid of a whole …
caefer Apr 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
// FIRST: read in the configuration
$config = fopen(CONFIG, 'r');
$data = fread($config, filesize(CONFIG));
$data = json_decode($data);
$data = json_decode($data, true);

if (!$data) die('JSON syntax error in "'.CONFIG.'"');

if ($data->rotate === 'left') {
if ($data['rotate'] === 'left') {
$rotate = '-webkit-transform: rotate(-90deg);';
}
elseif ($data->rotate === 'right') {
elseif ($data['rotate'] === 'right') {
$rotate = '-webkit-transform: rotate(90deg);';
} elseif ($data->rotate === 'flip') {
} elseif ($data['rotate'] === 'flip') {
$rotate = '-webkit-transform: rotate(180deg);';
} else {
$rotate = FALSE;
}

$width = (isset($data->width) ? $data->width . 'px' : '100%');
$width = (isset($data['width']) ? $data['width'] . 'px' : '100%');

function render($module) {
$argstr = array();
$args = $module->args;
$args->width = $module->width;
$args = isset($module['args']) ? $module['args'] : array();
$args['width'] = $module['width'];
foreach($args as $key => $val) {
$argstr[] = "$key=" . urlencode($val);
}
$argstr = "'" . implode("&", $argstr) . "'";

$style = "width: {$module->width}px;";
if ($module->height) $style .= " height: {$module->height}px";
echo "<div class='module $module->class' id='$module->name' style='$style'></div>\n";
echo "\t<script type='text/javascript'>activate_module('$module->name', $module->update, $argstr);</script>\n\n";
$style = "width: {$module['width']}px;";
if (isset($module['height'])) $style .= " height: {$module['height']}px";
echo "<div class='module".(isset($module['class'])?' '.$module['class']:'')."' id='".$module['name']."' style='$style'></div>\n";
echo "\t<script type='text/javascript'>activate_module('".$module['name']."', ".$module['update'].", $argstr);</script>\n\n";
}

?>
Expand All @@ -42,7 +42,7 @@ function render($module) {
<html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title><?php echo (isset($data->title) ? $data->title : 'statuspanic generic status board') ?></title>
<title><?php echo (isset($data['title']) ? $data['title'] : 'statuspanic generic status board') ?></title>
<link rel='stylesheet' type='text/css' href='resources/panic.css' />
<script type='text/javascript' src='resources/jquery.js'></script>
<script type='text/javascript' src='resources/board.js'></script>
Expand All @@ -60,9 +60,9 @@ function render($module) {
<body>
<div id='board'>
<?php
foreach($data->modules as $module)
foreach($data['modules'] as $module)
render($module);
?>
</div>
</body>
</html>
</html>