/[drupal]/contributions/modules/pblog/pblog.module

Diff of /contributions/modules/pblog/pblog.module

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.5.2.1,
Wed Feb 20 14:10:01 2008 UTC
+revision 1.5.2.2,
Sat Mar 29 20:19:29 2008 UTC
 Line 1
  <?php
- // $Id: pblog.module,v 1.5 2008/02/11 09:58:43 baldy Exp $
+ // $Id: pblog.module,v 1.5.2.1 2008/02/20 14:10:01 baldy Exp $
  /**
  * Work in progress Photo/Picture blog or pblog
  * laurence.baldwin@gmail.com
 Line 88 
 function pblog_view($node, $teaser = FAL
      $image_tag = theme_image("$file_dir/pblog/$node->nid$img_array[$counter]");
      $node->body .= l($image_tag, "pblog/$node->nid$med_image", array('attributes' => null, 'query' => null, 'fragment' => null, 'absolute' => TRUE, 'html' => TRUE));
      $int = $counter + 1;
-     if ( $int % 4 == 0 ) { $node->body .= '<br>'; }
+     if ( $int % 4 == 0 ) {
+       $node->body .= '<br>';
+     }
    }
    $node = node_prepare($node, "$teaser");
-Line 153 
 function pblog_image($nid = NULL, $pictu
+Line 155 
 function pblog_image($nid = NULL, $pictu
    }
    else {
      $node = node_load($nid);
-     drupal_set_title($title .= t(l($node->title,"node/$node->nid") ." - ". $picture));
+     drupal_set_title($title .= t(l($node->title, "node/$node->nid") ." - ". $picture));
      // to work out whats in front and behind we need to create an array of all the images in the directory
      // then find the current one.
-Line 185 
 function pblog_image($nid = NULL, $pictu
+Line 187 
 function pblog_image($nid = NULL, $pictu
      $main_image =l($image_tag, "$file_dir/pblog/$nid$full_image", array('attributes' => null, 'query' => null, 'fragment' => null, 'absolute' => TRUE, 'html' => TRUE));
      $output = "$main_image";
-     if ($current_image >= $num_images - 2) {  $next_image1 = $img_array[0]; }
+     if ($current_image >= $num_images - 2) {
-     else $next_image1 = $img_array[$current_image + 2];
+       $next_image1 = $img_array[0];
-     if ($current_image >= $num_images - 1) {  $next_image = $img_array[1]; }
+     }
-     else $next_image = $img_array[$current_image + 1];
+       else $next_image1 = $img_array[$current_image + 2];
+     if ($current_image >= $num_images - 1) {
+       $next_image = $img_array[1];
+     }
+       else $next_image = $img_array[$current_image + 1];
      $cur_image = $img_array[$current_image];
-     if ($current_image == 1 || $current_image == 0) {  $prev_image1 = $img_array[$num_images - 1];}
+     if ($current_image == 1 || $current_image == 0) {
-     else $prev_image1 = $img_array[$current_image - 2];
+       $prev_image1 = $img_array[$num_images - 1];
-     if ($current_image == 0) {  $prev_image = $img_array[$num_images - 2]; }
+     }
-     else $prev_image = $img_array[$current_image - 1];
+       else $prev_image1 = $img_array[$current_image - 2];
+     if ($current_image == 0) {
+       $prev_image = $img_array[$num_images - 2];
+     }
+       else $prev_image = $img_array[$current_image - 1];
      $trans = array("med" => "mini");
      $trans2 = array("-med" => "");
-Line 242 
 function pblog_insert($node) {
+Line 255 
 function pblog_insert($node) {
    if ($file) {
      drupal_set_message("file_check_upload = SUCCESS", 'status');
      // for extra debugging drupal_set_message('$file = '. print_r($file, true), 'status');
-     } else{
+   }
-     drupal_set_message("file_save_upload = FAILURE ". print_r($node, true), 'status');
+     else {
-   }
+       drupal_set_message("file_save_upload = FAILURE ". print_r($node, true), 'status');
+     }
    // full path to the file
    $fpath = escapeshellcmd($file->filepath);
    // first make a dir with the node id
    $pblog_dir = file_create_path("/pblog");
-   if (!file_exists($pblog_dir)) { mkdir($pblog_dir); }
+   if (!file_exists($pblog_dir)) {
+     mkdir($pblog_dir);
+   }
    $image_dir = file_create_path("pblog/$node->nid");
-   if (!file_exists("$image_dir")) { mkdir("$image_dir"); }
+   if (!file_exists("$image_dir")) {
+     mkdir("$image_dir");
+   }
    // check what kind of file it is, zip gzip or just a pic. Then move
    // unzip or do what ever.
-Line 269 
 function pblog_insert($node) {
+Line 287 
 function pblog_insert($node) {
        // assume unzip file into dir
        // `unzip /tmp/$f -d $image_dir`;
        // More complex but more portable way of doing things
-       if (class_exists('ZipArchive')){
+       if (class_exists('ZipArchive')) {
          $zip = new ZipArchive;
          if ($zip->open($fpath) === TRUE) {
              $zip->extractTo($image_dir);
              $zip->close();
-         } else {
+         }
-           form_set_error('image', t('The uploaded file was not a zip archive.'));
+           else {
+             form_set_error('image', t('The uploaded file was not a zip archive.'));
+           }
+       }
+         else {
+           drupal_set_message("php does not have built in zip support using system call to the unzip binary".'status');
+           `unzip $fpath -d $image_dir`;
          }
-       } else {
-         drupal_set_message("php does not have built in zip support using system call to the unzip binary". 'status');
-         `unzip $fpath -d $image_dir`;
-       }
        `rm $fpath`;
        break;
-Line 311 
 function pblog_insert($node) {
+Line 331 
 function pblog_insert($node) {
          $command3 = 'convert -size 500x375 "'. $image_dir .'/'. $s .'" -resize 500x375  +profile "*"        "'. $image_dir .'/'. $s_root .'-med.jpg"';
          exec($command3);
          */
          image_scale($image_dir .'/'. $s, $image_dir .'/'. $s_root .'-mini.jpg', 120, 120);
          image_scale($image_dir .'/'. $s, $image_dir .'/'. $s_root .'-med.jpg', 500, 375);
        }
      }
    }

 Legend:



Removed from v.1.5.2.1
 


changed lines


 
Added in v.1.5.2.2
 Legend:



Removed from v.1.5.2.1
 


changed lines


 
Added in v.1.5.2.2
-Removed from v.1.5.2.1
+Added in v.1.5.2.2

	ViewVC Help
Powered by ViewVC 1.1.2