From: Peter Sch?bl <sc...@us...> - 2002-03-30 16:26:51
|
Update of /cvsroot/pn-modules/PN_Image_Gallery/html/modules/PN_Image_Gallery/admin/modules In directory usw-pr-cvs1:/tmp/cvs-serv18750/html/modules/PN_Image_Gallery/admin/modules Modified Files: gallery.php Log Message: updates for PN 0.7.1 Index: gallery.php =================================================================== RCS file: /cvsroot/pn-modules/PN_Image_Gallery/html/modules/PN_Image_Gallery/admin/modules/gallery.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gallery.php 1 Jan 2002 14:31:28 -0000 1.2 --- gallery.php 30 Mar 2002 16:26:44 -0000 1.3 *************** *** 31,34 **** --- 31,37 ---- } + global $hlpfile, $admin, $ModName, $pntable; + global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4; + include "modules/$ModName/config.php"; include "modules/$ModName/ig_pntables.php"; *************** *** 38,41 **** --- 41,47 ---- modules_get_language(); + global $ig_config, $edit_vars; + + /** * Gallery Entry in the Edit -Form *************** *** 74,83 **** function adminGallery($gal_id, $action) { ! global $hlpfile, $admin, $currentlang, $bgcolor1, $bgcolor2, $pntable, $ModName; // form-variables for add global $add_gal_title, $add_gal_text, $add_gal_language, $add_gal_image, $add_gal_imagedir; global $add_gal_imagedir_full; ! global $gal_loc; ! global $dbconn; --- 80,94 ---- function adminGallery($gal_id, $action) { ! ! global $hlpfile, $admin, $bgcolor1, $bgcolor2, $ModName; ! global $pntable; ! // form-variables for add global $add_gal_title, $add_gal_text, $add_gal_language, $add_gal_image, $add_gal_imagedir; global $add_gal_imagedir_full; ! global $gal_loc, $ig_config; ! //global $dbconn; ! list($dbconn) = pnDBGetConn(); ! *************** *** 91,99 **** print "<center><font size=\"4\"><b>"._IG_IMAGEGALLERY."</b></font></center>"; CloseTable(); ! print "<br>"; printMessages(); OpenTable(); //debug_print_array(getImageDirs()); --- 102,120 ---- print "<center><font size=\"4\"><b>"._IG_IMAGEGALLERY."</b></font></center>"; CloseTable(); ! /* ! $output = new pnHTML(); ! $output->TableStart(); ! $output->Title(_IG_IMAGEGALLERY); ! $output->TableEnd(); ! ! print $output->GetOutput(); ! */ + print "<br>"; printMessages(); + OpenTable(); + //debug_print_array(getImageDirs()); *************** *** 106,113 **** print " </tr>"; $sql = "select gal_id from ". $pntable['gal_galleries']; ! //$result = mysql_query($sql) or die(mysql_error()); $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); $link_part1 = "<a class=\"pn-normal\" href=\"modules.php?op=modload&name=$ModName&file=index&mop=gallery"; //while ((list($gal_id_temp) = mysql_fetch_row($result))) while (list($gal_id_temp) = $result->fields) --- 127,136 ---- print " </tr>"; $sql = "select gal_id from ". $pntable['gal_galleries']; ! $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); $link_part1 = "<a class=\"pn-normal\" href=\"modules.php?op=modload&name=$ModName&file=index&mop=gallery"; + //$link_part1 = "<a class=\"pn-normal\" href=\"" . pnModUrl("PN_Image_Gallery", 'user', 'modload', array('mop' => 'gallery')); + //while ((list($gal_id_temp) = mysql_fetch_row($result))) while (list($gal_id_temp) = $result->fields) *************** *** 119,135 **** print " <td align=\"left\" width=\"100%\">$link_part1&gal_id=$gal_id_temp\">" . $desc[0] ."</a></td>"; ! print " <td align=\"right\" nowrap>(<a href=\"admin.php?op=igaledit&gal_id=$gal_id_temp\">"._EDIT."</a>-"; ! print " <a href=\"admin.php?op=igaldelete&gal_id=$gal_id_temp\">"._DELETE."</a>)</td>"; print "</tr>"; } print " </table></center>\n"; - /* - print "<form action=\"admin.php\" method=\"post\">\n"; - print " <input type=\"hidden\" name=\"op\" value=\"gallery\">\n"; - print " <br><input type=\"submit\" value=\"" . _IG_ADDGALLERY . "\"><br>\n"; - print "</form>"; - */ - - CloseTable(); --- 142,150 ---- print " <td align=\"left\" width=\"100%\">$link_part1&gal_id=$gal_id_temp\">" . $desc[0] ."</a></td>"; ! print " <td align=\"right\" nowrap><nobr>(<a href=\"admin.php?op=igaledit&gal_id=$gal_id_temp\">"._EDIT."</a>-"; ! print " <a href=\"admin.php?op=igaldelete&gal_id=$gal_id_temp\">"._DELETE."</a>)</nobr></td>"; print "</tr>"; } print " </table></center>\n"; CloseTable(); *************** *** 150,154 **** if (strlen($add_gal_language) == 0) { ! $add_gal_language = $currentlang; } $htmlSelect = new HtmlSelect("add_gal_language", $languages , 1, $add_gal_language); --- 165,169 ---- if (strlen($add_gal_language) == 0) { ! $add_gal_language = pnUserGetLang(); } $htmlSelect = new HtmlSelect("add_gal_language", $languages , 1, $add_gal_language); *************** *** 158,161 **** --- 173,178 ---- print " " . getHelpLink(_IG_HLP_GALLERY_TITLEIMAGE) . "\n"; $imagedirs = getImageDirs(); + //echo "baseDir [" . $ig_config['base_image_dir'] . "]<br>"; + //$imagedirs = getDirTree($ig_config['base_image_dir']); print " <br><br><b>" . _IG_IMAGEDIR. "</b><br>\n"; $htmlSelect = new HtmlSelect("add_gal_imagedir", $imagedirs , 1, $add_gal_imagedir); *************** *** 191,194 **** --- 208,212 ---- $edit_gal_imagedir = $gallery->image_dir; } + if (! isset($edit_gal_imagedir_full) || strlen($edit_gal_imagedir_full) == 0) { *************** *** 254,268 **** print "</form>"; ! /* ! CloseTable(); ! print "<br>"; ! OpenTable(); ! print "<center><font size=\"4\"><b>"._IG_USETOOLSON. " " . $gallery->getTitle() ."</b></font></center><br><br>"; ! print "<form action=\"admin.php\" method=\"post\">\n"; ! print " <input type=\"submit\" name=\"create_images\" value=\"" . _IG_CREATEICONS . "\">"; ! print " <input type=\"hidden\" name=\"gal_id\" value=\"$gal_id\">\n"; ! print " <input type=\"hidden\" name=\"op\" value=\"igaledit\">\n"; ! print "</form>"; ! */ break; } --- 272,276 ---- print "</form>"; ! break; } *************** *** 277,281 **** /** ! * get installed languages */ function getLanguages() --- 285,289 ---- /** ! * get array of installed languages. */ function getLanguages() *************** *** 311,316 **** function getDirTree($base_dir) { $handle = opendir($base_dir); ! //print "$base_dir<br>"; // \todo add max_depth_counter and limit $dirtree = array(); --- 319,326 ---- function getDirTree($base_dir) { + + //print "BaseDir [$base_dir] <br>"; $handle = opendir($base_dir); ! // \todo add max_depth_counter and limit $dirtree = array(); *************** *** 336,347 **** function addGallery($gal_title, $gal_text, $gal_language, $gal_image, $gal_imagedir, $gal_imagedir_full) { ! global $gal_messages, $pntable, $dbconn; if (!is_array($gal_messages)) { $gal_messages = array(); } - $gal_title = stripslashes(FixQuotes($gal_title)); - $gal_text = stripslashes(FixQuotes($gal_text)); if (strlen($gal_title) == 0 || strlen($gal_text) == 0 || strlen($gal_imagedir) == 0) --- 346,364 ---- function addGallery($gal_title, $gal_text, $gal_language, $gal_image, $gal_imagedir, $gal_imagedir_full) { ! global $gal_messages; ! global $pntable; ! list($dbconn) = pnDBGetConn(); if (!is_array($gal_messages)) { $gal_messages = array(); } + $gal_title = pnVarPrepForStore($gal_title); + $gal_text = pnVarPrepForStore($gal_text); + $gal_language = pnVarPrepForStore($gal_language); + $gal_imagedir = pnVarPrepForStore($gal_imagedir); + $gal_imagedir_full = pnVarPrepForStore($gal_imagedir_full); + //$gal_title = stripslashes(FixQuotes($gal_title)); + //$gal_text = stripslashes(FixQuotes($gal_text)); if (strlen($gal_title) == 0 || strlen($gal_text) == 0 || strlen($gal_imagedir) == 0) *************** *** 354,358 **** { // get max key -> it's needed for insertion of description ! //$result = mysql_query("select max(gal_id) FROM " . $pntable['gal_galleries']) or die (mysql_error()); $sql = "select max(gal_id) FROM " . $pntable['gal_galleries']; $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); --- 371,377 ---- { // get max key -> it's needed for insertion of description ! ! //$new_id = $dbconn->PO_Insert_ID($pntable['gal_galleries'], 'gal_id'); ! $sql = "select max(gal_id) FROM " . $pntable['gal_galleries']; $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); *************** *** 400,404 **** } adminGallery("", "new"); - } } --- 419,422 ---- *************** *** 411,415 **** function deleteGalleryQuery($gal_id) { ! global $hlpfile, $admin, $currentlang, $bgcolor1, $bgcolor2, $pntable, $dbconn; include 'header.php'; --- 429,435 ---- function deleteGalleryQuery($gal_id) { ! global $hlpfile, $admin, $bgcolor1, $bgcolor2; ! global $pntable; ! list($dbconn) = pnDBGetConn(); include 'header.php'; *************** *** 444,448 **** function deleteGallery($gal_id) { ! global $pntable, $gal_messages, $dbconn; if (!is_array($gal_messages)) { --- 464,470 ---- function deleteGallery($gal_id) { ! global $gal_messages; ! global $pntable; ! list($dbconn) = pnDBGetConn(); if (!is_array($gal_messages)) { *************** *** 454,458 **** $sql .= " where img_gal_id = $gal_id and des_key = img_id and des_type = 'img'"; //print "[$sql]<br>"; ! //$result = mysql_query($sql) or die(mysql_errno() . ":" . mysql_error()); $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); $des_keys = array(); --- 476,480 ---- $sql .= " where img_gal_id = $gal_id and des_key = img_id and des_type = 'img'"; //print "[$sql]<br>"; ! $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); $des_keys = array(); *************** *** 496,505 **** function saveGallery() { ! global $gal_messages, $ModName, $dbconn; if (! isset($gal_messages)) { $gal_messages = array(); } ! global $hlpfile, $admin, $currentlang, $bgcolor1, $bgcolor2, $pntable; // Gallery Descriptions global $edit_vars; --- 518,529 ---- function saveGallery() { ! global $gal_messages, $ModName; ! list($dbconn) = pnDBGetConn(); ! global $pntable; if (! isset($gal_messages)) { $gal_messages = array(); } ! global $hlpfile, $admin, $bgcolor1, $bgcolor2; // Gallery Descriptions global $edit_vars; *************** *** 641,660 **** } - // if called from index go back there -> but how ?? forward ??? - /* - if (isset($gal_loc) && $gal_loc == "index") - { - $new_url = "modules.php?op=modload&name=$ModName&file=index&mop=gallery&gal_id=$gal_id"; - // \todo find a way without need of new request - header("Location: $new_url"); // Redirect browser - exit; - - } - else - { - adminGallery("", "new"); - } - */ adminGallery("", "new"); --- 665,669 ---- *************** *** 717,726 **** function saveImage() { ! global $gal_messages, $ModName, $dbconn; if (! isset($gal_messages)) { $gal_messages = array(); } ! global $hlpfile, $admin, $currentlang, $bgcolor1, $bgcolor2, $pntable; // Gallery Descriptions global $edit_vars; --- 726,737 ---- function saveImage() { ! global $gal_messages, $ModName; ! list($dbconn) = pnDBGetConn(); ! global $pntable; if (! isset($gal_messages)) { $gal_messages = array(); } ! global $hlpfile, $admin, $bgcolor1, $bgcolor2; // Gallery Descriptions global $edit_vars; *************** *** 814,820 **** { // save descriptions for images ! global $pntable, $gal_messages, $dbconn; $image_description_count = 0; $imgae_descriptions_deleted = 0; foreach ($edit_vars as $des_lang => $description) { --- 825,838 ---- { // save descriptions for images ! global $gal_messages; ! global $pntable; ! list($dbconn) = pnDBGetConn(); $image_description_count = 0; $imgae_descriptions_deleted = 0; + if (!isset($edit_vars)) + { + die("SYS:edit_vars not set " . __FILE__ . ":" . __LINE__); + return; + } foreach ($edit_vars as $des_lang => $description) { *************** *** 825,829 **** //print "sql [$sql]<br>"; ! //$result = mysql_query($sql) or die(mysql_errno() . ":" . mysql_error()); $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); //list($count) = mysql_fetch_row($result); --- 843,847 ---- //print "sql [$sql]<br>"; ! $result = $dbconn->Execute($sql) or die($dbconn->ErrorNo() . ": ". $dbconn->ErrorMsg() . ":$sql"); //list($count) = mysql_fetch_row($result); *************** *** 909,913 **** function printGalleryStatistic($gal_id) { ! global $pntable, $dbconn; // get the number of descriptions for these gallery $sql = "select count(*) as gal_des_count, des_lang from ". $pntable['gal_descriptions']; --- 927,932 ---- function printGalleryStatistic($gal_id) { ! global $pntable; ! list($dbconn) = pnDBGetConn(); // get the number of descriptions for these gallery $sql = "select count(*) as gal_des_count, des_lang from ". $pntable['gal_descriptions']; *************** *** 1012,1016 **** function editImage($img_name, $gal_id, $img_id) { ! global $hlpfile, $admin, $currentlang, $bgcolor1, $bgcolor2, $pntable, $ModName, $dbconn; // array with process-infos/erros --- 1031,1037 ---- function editImage($img_name, $gal_id, $img_id) { ! global $hlpfile, $admin, $bgcolor1, $bgcolor2, $ModName; ! global $pntable; ! list($dbconn) = pnDBGetConn(); // array with process-infos/erros *************** *** 1165,1169 **** function printDescEditTable($edit_vars) { ! global $bgcolor1, $bgcolor2, $pntable, $ModName; print " <table border=\"1\" colspan=\"3\" rowspan=\"3\" width=\"100%\" bgcolor=\"$bgcolor1\">"; print " <tr>\n"; --- 1186,1191 ---- function printDescEditTable($edit_vars) { ! global $bgcolor1, $bgcolor2, $ModName; ! global $pntable; print " <table border=\"1\" colspan=\"3\" rowspan=\"3\" width=\"100%\" bgcolor=\"$bgcolor1\">"; print " <tr>\n"; *************** *** 1215,1219 **** function readGalleryDescriptions($gal_id) { ! global $pntable, $edit_vars, $dbconn; // read description for object $sql = "select des_lang, des_title, des_text from " . $pntable['gal_descriptions']; --- 1237,1243 ---- function readGalleryDescriptions($gal_id) { ! global $edit_vars; ! global $pntable; ! list($dbconn) = pnDBGetConn(); // read description for object $sql = "select des_lang, des_title, des_text from " . $pntable['gal_descriptions']; *************** *** 1243,1247 **** function readImageDescriptions($img_name, $gal_id, $img_id) { ! global $pntable, $edit_vars, $dbconn; // read description for object $sql = "select des_lang, des_title, des_text "; --- 1267,1273 ---- function readImageDescriptions($img_name, $gal_id, $img_id) { ! global $edit_vars; ! global $pntable; ! list($dbconn) = pnDBGetConn(); // read description for object $sql = "select des_lang, des_title, des_text "; *************** *** 1344,1346 **** } ! ?> \ No newline at end of file --- 1370,1372 ---- } ! ?> |