Produced by Araxis Merge on Mon Jan 24 00:15:34 2005 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | e:\tech\cvs\coppermine\stable-head | util.php | Sat Aug 28 04:19:53 2004 UTC |
| 2 | e:\tech\cvs\coppermine\stable | util.php | Sun Jan 23 23:39:00 2005 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Blocks | Lines | |
| Unchanged | 14 | 441 |
| Changed | 7 | 17 |
| Inserted | 4 | 10 |
| Removed | 2 | 6 |
| Whitespace | All differences in whitespace within lines are ignored |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Hidden in comparison detail |
No regular expressions were active.
| 1 | <?php | 1 | <?php | |||
| 2 | // ------------------------------------------------------------------------- // | 2 | // ------------------------------------------------------------------------- // | |||
| 3 | // Coppermine Photo Gallery 1.3.2 // | 3 | // Coppermine Photo Gallery 1.3.2 // | |||
| 4 | // ------------------------------------------------------------------------- // | 4 | // ------------------------------------------------------------------------- // | |||
| (11 unchanged lines omitted) | ||||||
| 16 | // ------------------------------------------------------------------------- // | 16 | // ------------------------------------------------------------------------- // | |||
| 17 | // CVS version: $Id: util.php,v 1.11 2004/08/28 04:19:53 gaugau Exp $ | 17 | // CVS version: $Id: util.php,v 1.11 2004/08/28 04:19:53 gaugau Exp $ | |||
| 18 | // ------------------------------------------------------------------------- // | 18 | // ------------------------------------------------------------------------- // | |||
| 19 | 19 | |||||
| 20 | // USER CONFIGURATION | |||||
| 21 | // Default number of pictures to process at a time when rebuilding thumbs or normals: | |||||
| 22 | $defpicnum = 45; | |||||
| 23 | // END USER CONFIGURATION | |||||
| 24 | ||||||
| 25 | define('IN_COPPERMINE', true); | 20 | define('IN_COPPERMINE', true); | |||
| 26 | define('UTIL_PHP', true); | 21 | define('UTIL_PHP', true); | |||
| 27 | 22 | |||||
| 28 | require('include/init.inc.php'); | 23 | require('include/init.inc.php'); | |||
| 29 | require('include/picmgmt.inc.php'); | 24 | require('include/picmgmt.inc.php'); | |||
| 30 | 25 | |||||
| 31 | pageheader($lang_util_php['title']); | 26 | pageheader($lang_util_php['title']); | |||
| 32 | 27 | |||||
| 28 | // USER CONFIGURATION | |||||
| 29 | // (Must come after init.inc.php | |||||
| 30 | // Default number of pictures to process at a time when rebuilding thumbs or normals: | |||||
| 31 | $defpicnum = 45; | |||||
| 32 | // END USER CONFIGURATION | |||||
| 33 | ||||||
| 33 | if (!GALLERY_ADMIN_MODE) die('Access denied'); | 34 | if (!GALLERY_ADMIN_MODE) die('Access denied'); | |||
| 34 | 35 | |||||
| 35 | global $albumtbl, $picturetbl, $categorytbl, $usertbl, $lang_util_php; | 36 | global $albumtbl, $picturetbl, $categorytbl, $usertbl, $lang_util_php; | |||
| 36 | $albumtbl = $CONFIG['TABLE_PREFIX'] . 'albums'; | 37 | $albumtbl = $CONFIG['TABLE_PREFIX'] . 'albums'; | |||
| (20 unchanged lines omitted) | ||||||
| 57 | $albumid = $_POST['albumid']; | 58 | $albumid = $_POST['albumid']; | |||
| 58 | $parsemode = $_POST['parsemode']; | 59 | $parsemode = $_POST['parsemode']; | |||
| 59 | global $picturetbl, $lang_util_php; | 60 | global $picturetbl, $lang_util_php; | |||
| 60 | 61 | |||||
| 61 | $query = "SELECT * FROM $picturetbl WHERE aid = '$albumid' "; | 62 | $query = "SELECT * FROM $picturetbl "; | |||
| 63 | if ($albumid != -99) $query .= " WHERE aid = '$albumid'"; | |||||
| 62 | $result = db_query($query); | 64 | $result = db_query($query); | |||
| 63 | $num = mysql_numrows($result); | 65 | $num = mysql_numrows($result); | |||
| 64 | 66 | |||||
| 65 | $i = 0; | 67 | $i = 0; | |||
| (47 unchanged lines omitted) | ||||||
| 113 | $query = "SELECT aid, category, IF(user_name IS NOT NULL, CONCAT('(', user_name, ') ',title), CONCAT(' - ', title)) AS title " . "FROM $albumtbl AS a " . "LEFT JOIN $usertbl AS u ON category = (" . FIRST_USER_CAT . " + user_id) " . "ORDER BY category, title"; | 115 | $query = "SELECT aid, category, IF(user_name IS NOT NULL, CONCAT('(', user_name, ') ',title), CONCAT(' - ', title)) AS title " . "FROM $albumtbl AS a " . "LEFT JOIN $usertbl AS u ON category = (" . FIRST_USER_CAT . " + user_id) " . "ORDER BY category, title"; | |||
| 114 | $result = db_query($query); | 116 | $result = db_query($query); | |||
| 115 | // $num=mysql_numrows($result); | 117 | // $num=mysql_numrows($result); | |||
| 116 | echo '<select size="1" name="albumid">'; | 118 | echo '<select size="1" name="albumid">'; | |||
| 119 | echo "<option value=\"-99\">".$lang_util_php['process_all_albums']."</option>\n"; | |||||
| 117 | 120 | |||||
| 118 | while ($row = mysql_fetch_array($result)) { | 121 | while ($row = mysql_fetch_array($result)) { | |||
| 119 | $sql = "SELECT name FROM $categorytbl WHERE cid = " . $row["category"]; | 122 | $sql = "SELECT name FROM $categorytbl WHERE cid = " . $row["category"]; | |||
| 120 | $result2 = db_query($sql); | 123 | $result2 = db_query($sql); | |||
| (16 unchanged lines omitted) | ||||||
| 137 | $numpics = $_POST['numpics']; | 140 | $numpics = $_POST['numpics']; | |||
| 138 | $startpic = 0; | 141 | $startpic = 0; | |||
| 139 | $startpic = $_POST['startpic']; | 142 | $startpic = $_POST['startpic']; | |||
| 140 | 143 | |||||
| 141 | $query = "SELECT * FROM $picturetbl WHERE aid = '$albumid' "; | 144 | $query = "SELECT * FROM $picturetbl "; | |||
| 145 | if ($albumid != -99) $query .= " WHERE aid = '$albumid'"; | |||||
| 142 | $result = db_query($query); | 146 | $result = db_query($query); | |||
| 143 | $totalpics = mysql_numrows($result); | 147 | $totalpics = mysql_numrows($result); | |||
| 144 | 148 | |||||
| 145 | if ($startpic == 0) { | 149 | if ($startpic == 0) { | |||
| (17 unchanged lines omitted) | ||||||
| 163 | if (resize_image($image, $thumb, $CONFIG['thumb_width'], $CONFIG['thumb_method'], $CONFIG['thumb_use'])) { | 167 | if (resize_image($image, $thumb, $CONFIG['thumb_width'], $CONFIG['thumb_method'], $CONFIG['thumb_use'])) { | |||
| 164 | print $thumb .' '. $lang_util_php['updated_succesfully'] . '!<br />'; | 168 | print $thumb .' '. $lang_util_php['updated_succesfully'] . '!<br />'; | |||
| 165 | my_flush(); | 169 | my_flush(); | |||
| 166 | } else { | 170 | } else { | |||
| 167 | print $lang_util_php['error_create'] . ' : $thumb<br /> ' ; | 171 | print $lang_util_php['error_create'] . " : $thumb<br /> " ; | |||
| 168 | my_flush(); | 172 | my_flush(); | |||
| 169 | } | 173 | } | |||
| 170 | } | 174 | } | |||
| 171 | 175 | |||||
| (2 unchanged lines omitted) | ||||||
| 174 | 178 | |||||
| 175 | $imagesize = getimagesize($image); | 179 | $imagesize = getimagesize($image); | |||
| 176 | if (max($imagesize[0], $imagesize[1]) > $CONFIG['picture_width'] && $CONFIG['make_intermediate']) { | 180 | if (max($imagesize[0], $imagesize[1]) > $CONFIG['picture_width'] && $CONFIG['make_intermediate']) { | |||
| 177 | if (resize_image($image, $normal, $CONFIG['picture_width'], $CONFIG['thumb_method'], $CONFIG['thumb_use'])) { | 181 | if (resize_image($image, $normal, $CONFIG['picture_width'], $CONFIG['thumb_method'], $CONFIG['thumb_use'])) { | |||
| 178 | print $normal . $lang_util_php['updated_succesfully'] . '!<br />'; | 182 | print $normal . ' '. $lang_util_php['updated_succesfully'] . '!<br />'; | |||
| 179 | my_flush(); | 183 | my_flush(); | |||
| 180 | } else { | 184 | } else { | |||
| 181 | print $lang_util_php['error_create'] . ' : $normal<br /> ' ; | 185 | print $lang_util_php['error_create'] . " : $normal<br /> " ; | |||
| 182 | my_flush(); | 186 | my_flush(); | |||
| 183 | } | 187 | } | |||
| 184 | } | 188 | } | |||
| 185 | } | 189 | } | |||
| (21 unchanged lines omitted) | ||||||
| 207 | { | 211 | { | |||
| 208 | global $picturetbl, $CONFIG, $lang_util_php; | 212 | global $picturetbl, $CONFIG, $lang_util_php; | |||
| 209 | $albumid = $_POST['albumid']; | 213 | $albumid = $_POST['albumid']; | |||
| 210 | 214 | |||||
| 211 | $query = "SELECT * FROM $picturetbl WHERE aid = '$albumid' "; | 215 | $query = "SELECT * FROM $picturetbl "; | |||
| 216 | if ($albumid != -99) $query .= " WHERE aid = '$albumid'"; | |||||
| 212 | $result = db_query($query); | 217 | $result = db_query($query); | |||
| 213 | $num = mysql_numrows($result); | 218 | $num = mysql_numrows($result); | |||
| 214 | 219 | |||||
| 215 | $i = 0; | 220 | $i = 0; | |||
| (87 unchanged lines omitted) | ||||||
| 303 | 308 | |||||
| 304 | 309 | |||||
| 305 | $phpself = $_SERVER['PHP_SELF']; | 310 | $phpself = $_SERVER['PHP_SELF']; | |||
| 306 | // start output | 311 | // start output | |||
| 312 | if (!defined('UDB_INTEGRATION') || UDB_INTEGRATION != 'e107') | |||||
| 313 | { // e107 integrates this; no header needed | |||||
| 307 | print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | 314 | print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | |||
| 308 | <html> | 315 | <html> | |||
| 309 | <head> | 316 | <head> | |||
| 310 | <title>' . $lang_util_php['title'] . '</title> | 317 | <title>' . $lang_util_php['title'] . '</title> | |||
| (2 unchanged lines omitted) | ||||||
| 313 | .labelradio { cursor : hand;} | 320 | .labelradio { cursor : hand;} | |||
| 314 | /*.accesskey {text-decoration:underline}*/ | 321 | /*.accesskey {text-decoration:underline}*/ | |||
| 315 | </style> | 322 | </style> | |||
| 316 | <body>'; | 323 | <body>'; | |||
| 317 | 324 | } | ||||
| 318 | if ($action == 'thumbs') { | 325 | if ($action == 'thumbs') { | |||
| 319 | global $picturetbl, $CONFIG; | 326 | global $picturetbl, $CONFIG; | |||
| 320 | 327 | |||||
| 321 | print '<a href="' . $phpself . '">' . $lang_util_php['back'] . '</a><br />'; | 328 | print '<a href="' . $phpself . '">' . $lang_util_php['back'] . '</a><br />'; | |||
| (121 unchanged lines omitted) | ||||||
| 443 | } else { | 450 | } else { | |||
| 444 | filloptions(); | 451 | filloptions(); | |||
| 445 | } | 452 | } | |||
| 446 | 453 | |||||
| 447 | } | |||||
| 448 | print '</td></tr>'; | 454 | print '</td></tr>'; | |||
| 449 | endtable(); | 455 | endtable(); | |||
| 456 | } | |||||
| 450 | echo 'Util.mod 1.4 - Created by David Alberg Holm'; | 457 | echo 'Util.mod 1.4 - Created by David Alberg Holm'; | |||
| 451 | pagefooter(); | 458 | pagefooter(); | |||
| 452 | ob_end_flush(); | 459 | ob_end_flush(); | |||
| 453 | 460 | |||||
| 454 | ?> | 461 | ?> | |||
Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.