nid? $node->nid: time()); // 'insert' has no $node->nid break; case 'lightbox': $displayimage .= ' rel="lightbox['. $setname .']"'; - #$attributes['rel'] = 'lightbox[' . ($node->nid? $node->nid: time()) . ']'; // 'insert' has no $node->nid break; case 'greybox': @@ -469,10 +440,7 @@ } else { $displayimage .= ''; - #$result .= '
'. $retval[$poct-1] . ''; # $fullimgpath @@ -526,36 +494,30 @@ function render_brilliant_gallery($thisfolder = '', $colcountoverride = '', $widthoverride = '', $sortoverride = '', $maximumnumbertoshow = '', $colouroverride = '', $beginfromoverride = 1, $captionyesnotext = '') { // Is this a Picasa gallery? $picasafolder = false; - #echo '....'.substr($thisfolder,0,29); if (substr($thisfolder,0,24) == 'http://picasaweb.google.') { // Must work for all variants - http://picasaweb.google.com, http://picasaweb.google.co.uk, etc. $picasafolder = true; } + // future add in of separate CSS support #drupal_add_css(drupal_get_path('module', 'brilliant_gallery') .'/brilliant_gallery.css'); + # First some household cleaning. Delete expired cache files at 11:11 (if someone calls this script, of course!) if (date('h') == '11' and date('i') == '11') { - #if ( date( 'h' ) == '12' ) { - #echo date( 'h' ); cleantmpdir(); } + # Patching a possible problem with i18n $langcode = ''; if (function_exists('i18n_get_lang')) { $langcode = i18n_get_lang(); } - #$result = ''; + $result = ''; $galleryfolder = variable_get('brilliant_gallery_folder', ''); if (substr($galleryfolder, strlen($galleryfolder) - 1, 1) == '/' or substr($galleryfolder, 0, 1) == '/') { - #watchdog('error', 'failed to notify "weblogs.com" (site)'); - #form_set_error('yemail', t('Header injection attempt detected. Do not enter line feed characters into the from field!')); return 'Main gallery folder path must not begin or end with a slash; please fix it in the settings page.'; } -/* - if ($thisfolder <> '') { - $galleryfolder .= '/'. $thisfolder; - } -*/ + if ( $thisfolder <> '') { if ($galleryfolder <> '') { $galleryfolder .= '/' . $thisfolder; @@ -564,42 +526,45 @@ $galleryfolder = $thisfolder; } } + if ($colcountoverride == '') { $columns = variable_get('brilliant_gallery_maxcol', 3); } else { $columns = $colcountoverride; } + if ($widthoverride == '') { $imagewidth = variable_get('brilliant_gallery_maximagewidth', 150); } else { $imagewidth = $widthoverride; } + if ($sortoverride == '' or strtolower($sortoverride) == 'sort') { $brilliant_gallery_sort = variable_get('brilliant_gallery_sort', '1'); } else { $brilliant_gallery_sort = $sortoverride; } + if ($colouroverride == '') { $bgcolour = variable_get('brilliant_gallery_bcgcolour_textfield', '#000000'); } else { $bgcolour = $colouroverride; } - #if ($captionyesornot == 'yes' or $captionyesornot == '' or (variable_get('brilliant_gallery_caption', '') <> '' and $captionyesornot <> 'no')) { + if (($captionyesnotext == 'yes' or $captionyesnotext == '') and variable_get('brilliant_gallery_caption', '') <> '' ) { $showcaption = 'filename'; } - #else if ($captionyesornot == 'no') { else if ($captionyesnotext == 'no' or (variable_get('brilliant_gallery_caption', '') == '' and ($captionyesnotext == 'yes' or $captionyesnotext == 'no'))) { $showcaption = ''; } else { - #$showcaption = $captionyesornot; $showcaption = $captionyesnotext; } + $padding = variable_get('brilliant_gallery_padding', 3); $overbrowser = variable_get('brilliant_gallery_overbrowser', 'lightbox'); // Totally full resolution display would be impractical, so this is the maximum width of "full" resolution. @@ -622,14 +587,11 @@ $mkdirek = $pcachetemp . '/bg_picasa_'. $mgalleryurl; if (is_dir($mkdirek)===true) { // If it exists, we assume it is also populated, so we don't create it, and we don't go fetching the remote data! - #echo 'exists'; } else { - #echo 'new'; include ('./'. drupal_get_path('module', 'brilliant_gallery') ."/picasa.inc"); } $absolpath = $mkdirek; - #$absolpath = '/tmp/bg_picasa_838e4e98afdffbec2ed6d34e6bfa497c'; #echo $absolpath; #drupal_set_message(t('absol: '.$absolpath)); } @@ -640,7 +602,6 @@ } $absolpath = realpath($rp); } - #$result .= $absolpath; # Make an array with images in this folder, and their properties. $temp = load_dir_to_array($absolpath, $imagewidth, $fullresolutionmaxwidth, $brilliant_gallery_sort); @@ -648,22 +609,10 @@ $imagemaxh = $temp[1]; $maxpoct = count($retval_dimensions); if (arg(2) == 'edit') { - #print_r( $retval_dimensions ); } # Get a list of images that are forbidden from display. - #$uid=$user->uid; - #echo $user->uid; $excludedimgs = array(); - // any checkbox id that starts with user- we remember the current user's settings - // any other id is global and we use user=0 - /* - $result=db_query("select qid,state from brilliant_gallery_checklist ". - " where nid='$nid' and qid not like 'user-%' and user=0 ". - " union ". - "select qid,state from brilliant_gallery_checklist ". - "where nid='$nid' and qid like 'user-%' and user='$uid' "); - */ $dbresult = db_query("select qid from brilliant_gallery_checklist where qid like 'user-%' and state='1' "); while ($data = db_fetch_object($dbresult)) { @@ -674,22 +623,14 @@ # Total 'width' controls the number of thumbnails in each row. The number, in pixels, should be calculated thusly: [maximum width desired for thumbnails] + [padding - if any, x 2] + [margin - if any, x 2] + [border - if any, x 2] x [number of thumbnails desired in each row] $style_ul = "font-size:0; margin:0px; padding:0px; width: ". (($imagewidth + 2 * $padding) * $columns) ."px;"; $column_count = 0; - #$pocetobr = 0; $setname = mt_rand(1, 9999999); - #$result .= '
| '); - #$result .= (' | ' . "\n");
- #$pocetobr += 1;
+
if (testext($retval[$poct - 1])) {
$caption = str_replace(array('.', '_'), ' ', basename($retval[$poct - 1], strrchr($retval[$poct - 1], '.')));
- #$smallenough = false;
$imgw = $retval_dimensions[$poct - 1]['imgw'];
$imgh = $retval_dimensions[$poct - 1]['imgh'];
$imgwbig = $retval_dimensions[$poct - 1]['imgwbig'];
$imghbig = $retval_dimensions[$poct - 1]['imghbig'];
- #@$smallenough = $retval_dimensions[$poct - 1]['smallenough'];
- #$style_li = "float: left; list-style: none; background: #000; width: 44px; height: 33px; padding: 4px; text-align: center; margin: 0; border: none;";
$style_li = "font-size:0; float: left; width: ". $imagewidth ."px; list-style: none; background: ". $bgcolour ."; height: ". $imagemaxh ."px; padding: ". $padding ."px; text-align: center; margin: 0px; border: none;";
$result .= (' | ';
$result .= '' . "\n";
$column_count += 1;
#if ($column_count == $columns) { $result .= ("
'; - #$result .= '
'; return $result; }