projects / acontent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7dc9105)
4888: prog.php: prevent "Undefined index:" frame, done and t issue_4888
authorTJ <acontent@iam.tj>
Tue, 11 Oct 2011 12:21:38 +0000 (13:21 +0100)
committerTJ <acontent@iam.tj>
Wed, 19 Oct 2011 19:10:24 +0000 (20:10 +0100)
home/prog.php patch | blob | history

diff --git a/home/prog.php b/home/prog.php
index 6ce833b..8166b92 100644 (file)
--- a/home/prog.php
+++ b/home/prog.php
@@ -26,19 +26,19 @@ if (isset($_GET['tile']) && $_GET['tile']) {
 <html lang="<?php echo $myLang->getCode(); ?>">
 <head>
        <title><?php echo _AT($lang_variable); ?></title>
-       <?php if ($_GET['frame']) { ?>
+       <?php if (array_key_exists('frame', $_GET)) { ?>
                <META HTTP-EQUIV="refresh" content="3;URL=prog.php?frame=1"> 
        <?php } ?>
        <link rel="stylesheet" href="<?php echo $_base_path; ?>themes/<?php echo $_SESSION['prefs']['PREF_THEME']; ?>/styles.css" type="text/css" />
        <meta http-equiv="Content-Type" content="text/html; <?php echo $myLang->getCharacterSet(); ?>" />
 </head>
 <body <?php
-       if ($_SESSION['done']) {
+       if (array_key_exists('done', $_SESSION)) {
                echo 'onload="parent.window.close();"';
        }
 ?>>
 <?php 
-if (!$_GET['frame']) {  ?>
+if (!array_key_exists('frame', $_GET)) {  ?>
 &nbsp;<a href="javascript:window.close();"><?php echo _AT('close'); ?></a>
 <h3><?php echo _AT($lang_variable); ?></h3>
 <p><small><?php echo _AT('window_auto_close'); ?></small></p>
@@ -51,30 +51,32 @@ if (!$_GET['frame']) {  ?>
 </iframe>
 <?php } else { 
        $tmp_dir = ini_get('upload_tmp_dir') . DIRECTORY_SEPARATOR;
-       if (isset ($_GET['t']) && !$_GET['t']) {
-               $newest_file_name = '';
-               $newest_file_time = 0;
-               // get the name of the temp file.
-               if ($dir = @opendir($tmp_dir)) {
-                       while (($file = readdir($dir)) !== false) {
-                               if ((strlen($file) == 9) && (substr($file, 0, 3) == 'php')) {
-                                       $filedata = stat($tmp_dir . $file);
-                                       if ($filedata['mtime'] > $newest_file_time) {
-                                               $newest_file_time = $filedata['mtime'];
-                                               $newest_file_name = $file;
-                                               $size = $filedata['size'] / 1024;
+       if (isset($_GET['t'])) {
+               if (!$_GET['t']) {
+                       $newest_file_name = '';
+                       $newest_file_time = 0;
+                       // get the name of the temp file.
+                       if ($dir = @opendir($tmp_dir)) {
+                               while (($file = readdir($dir)) !== false) {
+                                       if ((strlen($file) == 9) && (substr($file, 0, 3) == 'php')) {
+                                               $filedata = stat($tmp_dir . $file);
+                                               if ($filedata['mtime'] > $newest_file_time) {
+                                                       $newest_file_time = $filedata['mtime'];
+                                                       $newest_file_name = $file;
+                                                       $size = $filedata['size'] / 1024;
+                                               }
                                        }
                                }
+                               closedir($dir);
                        }
-                       closedir($dir);
+               } else {
+                       $filedata = stat($tmp_dir . $_GET['t']);
+                       $size = $filedata['size'] / TR_KBYTE_SIZE;
                }
-       } else {
-               $filedata = stat($tmp_dir . $_GET['t']);
-               $size = $filedata['size'] / TR_KBYTE_SIZE;
        }
-       // not sure where these are displayed in the progress popup
+       // displayed in the small iframe alongside the progress animated image
        echo '<small>';
-       if (isset($size) && $size == '') {
+       if (!isset($size) || isset($size) && $size == '') {
                echo '<em>'._AT('unknown').' </em>  '._AT('kb');
        } else {
                echo number_format($size, 2).' '._AT('kb');
AContent learning content authoring system