Changeset 5008


Ignore:
Timestamp:
03/01/10 11:43:19 (10 years ago)
Author:
laurent.duretz
Message:

Issue 1472 : Listing genration fail if thumbnail directory does not exists

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/tools/create_listing_file.php

    r5007 r5008  
    9494// ****** Thumbnails generation functionality ****** // 
    9595// Define if images have to be reduced if they are not 
    96 $conf['thumbnail'] = true; 
     96$conf['thumbnail'] = false; 
    9797 
    9898// Define method to generate thumbnails :  
     
    184184function pwg_check_graphics() 
    185185{ 
    186   pwg_log('>>>>> pwg_check_graphics() >>>>>'."\n"); 
     186  //~ pwg_log('>>>>> pwg_check_graphics() >>>>>'."\n"); 
    187187   
    188188  global $conf, $pwg_conf; 
     
    291291  } 
    292292   
    293   pwg_log('<<<<< pwg_check_graphics() returns '.var_export($log, TRUE).' <<<<<'."\n"); 
     293  //~ pwg_log('<<<<< pwg_check_graphics() returns '.var_export($log, TRUE).' <<<<<'."\n"); 
    294294  return $log; 
    295295} 
     
    304304function pwg_close_level($dir_start, $dir_number) 
    305305{ 
    306   pwg_log('>>>>> pwg_close_level($dir_start = '.var_export($dir_start, TRUE).', $dir_number = '.var_export($dir_number, TRUE).') >>>>>'."\n"); 
     306  //~ pwg_log('>>>>> pwg_close_level($dir_start = '.var_export($dir_start, TRUE).', $dir_number = '.var_export($dir_number, TRUE).') >>>>>'."\n"); 
    307307   
    308308  $lines =''; 
     
    315315  while(($dir_number > 0) && ($dir_start >= 0)); 
    316316   
    317   pwg_log('<<<<< pwg_close_level returns '.var_export($lines, TRUE).' <<<<<'."\n"); 
     317  //~ pwg_log('<<<<< pwg_close_level returns '.var_export($lines, TRUE).' <<<<<'."\n"); 
    318318  return $lines; 
    319319} 
     
    327327function pwg_clean_iptc_value($value) 
    328328{ 
    329   pwg_log('>>>>> pwg_clean_iptc_value ($value = '.var_export($value, TRUE).') >>>>>'."\n"); 
     329  //~ pwg_log('>>>>> pwg_clean_iptc_value ($value = '.var_export($value, TRUE).') >>>>>'."\n"); 
    330330   
    331331  // strip leading zeros (weird Kodak Scanner software) 
     
    337337  $value = str_replace(chr(0x00), ' ', $value); 
    338338 
    339   pwg_log('<<<<< pwg_clean_iptc_value() returns '.var_export($value, TRUE).' <<<<<'."\n"); 
     339  //~ pwg_log('<<<<< pwg_clean_iptc_value() returns '.var_export($value, TRUE).' <<<<<'."\n"); 
    340340  return $value; 
    341341} 
     
    351351function pwg_get_iptc_data($filename, $map) 
    352352{ 
    353   pwg_log('>>>>> pwg_get_iptc_data ($filename = '.var_export($filename, TRUE).', $map = '.var_export($map, TRUE).') >>>>>'."\n"); 
     353  //~ pwg_log('>>>>> pwg_get_iptc_data ($filename = '.var_export($filename, TRUE).', $map = '.var_export($map, TRUE).') >>>>>'."\n"); 
    354354   
    355355  $result = array(); 
     
    389389  } 
    390390   
    391   pwg_log('<<<<< pwg_get_iptc_data() returns '.var_export($result, TRUE).' <<<<<'."\n"); 
     391  //~ pwg_log('<<<<< pwg_get_iptc_data() returns '.var_export($result, TRUE).' <<<<<'."\n"); 
    392392  return $result; 
    393393} 
     
    401401function pwg_get_sync_iptc_data($file) 
    402402{ 
    403   pwg_log('>>>>> pwg_get_sync_iptc_data ($file = '.var_export($file, TRUE).') >>>>>'."\n"); 
     403  //~ pwg_log('>>>>> pwg_get_sync_iptc_data ($file = '.var_export($file, TRUE).') >>>>>'."\n"); 
    404404 
    405405  global $conf; 
     
    430430  $iptc['keywords'] = isset($iptc['keywords']) ? implode(',', array_unique(explode(',', $iptc['keywords']))) : NULL; 
    431431 
    432   pwg_log('<<<<< pwg_get_sync_iptc_data() returns '.var_export($iptc, TRUE).' <<<<<'."\n"); 
     432  //~ pwg_log('<<<<< pwg_get_sync_iptc_data() returns '.var_export($iptc, TRUE).' <<<<<'."\n"); 
    433433  return $iptc; 
    434434} 
     
    443443function pwg_get_representative_ext($file_dir, $file_short) 
    444444{ 
    445   pwg_log('>>>>> pwg_get_representative_ext($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n"); 
     445  //~ pwg_log('>>>>> pwg_get_representative_ext($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n"); 
    446446   
    447447  global $conf; 
     
    457457  } 
    458458   
    459   pwg_log('<<<<< pwg_get_representative_ext() returns '.var_export($rep_ext, TRUE).' <<<<<'."\n"); 
     459  //~ pwg_log('<<<<< pwg_get_representative_ext() returns '.var_export($rep_ext, TRUE).' <<<<<'."\n"); 
    460460  return $rep_ext;  
    461461} 
     
    470470function pwg_get_high($file_dir, $file_base) 
    471471{ 
    472   pwg_log('>>>>> pwg_get_high($file = '.var_export($file_dir, TRUE).', $line = '.var_export($file_base, TRUE).') >>>>>'."\n"); 
     472  //~ pwg_log('>>>>> pwg_get_high($file = '.var_export($file_dir, TRUE).', $line = '.var_export($file_base, TRUE).') >>>>>'."\n"); 
    473473   
    474474  global $conf; 
     
    480480  } 
    481481   
    482   pwg_log('<<<<< pwg_get_high() returns '.var_export($high, TRUE).' <<<<<'."\n"); 
     482  //~ pwg_log('<<<<< pwg_get_high() returns '.var_export($high, TRUE).' <<<<<'."\n"); 
    483483  return $high;  
    484484} 
     
    492492function pwg_get_filename_wo_extension($filename) 
    493493{ 
    494   pwg_log('>>>>> _get_filename_wo_extension($filename = '.var_export($filename, TRUE).') >>>>>'."\n"); 
     494  //~ pwg_log('>>>>> _get_filename_wo_extension($filename = '.var_export($filename, TRUE).') >>>>>'."\n"); 
    495495   
    496496  $short_name = substr($filename, 0, strrpos($filename, '.')); 
    497497   
    498   pwg_log('<<<<< _get_filename_wo_extension() returns '.var_export($short_name, TRUE).' <<<<<'."\n"); 
     498  //~ pwg_log('<<<<< _get_filename_wo_extension() returns '.var_export($short_name, TRUE).' <<<<<'."\n"); 
    499499  return $short_name; 
    500500} 
     
    511511function pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, &$error_log) 
    512512{ 
    513   pwg_log('>>>>> pwg_get_thumbnail_ext($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n"); 
     513  //~ pwg_log('>>>>> pwg_get_thumbnail_ext($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n"); 
    514514   
    515515  global $conf; 
     
    538538  } 
    539539   
    540   pwg_log('<<<<< pwg_get_thumbnail_ext() returns '.var_export($thumb_ext, TRUE).' <<<<<'."\n"); 
     540  //~ pwg_log('<<<<< pwg_get_thumbnail_ext() returns '.var_export($thumb_ext, TRUE).' <<<<<'."\n"); 
    541541  return $thumb_ext;  
    542542} 
     
    553553function pwg_icon_file($file_dir, $file_short, $file_ext) 
    554554{ 
    555   pwg_log('>>>>> pwg_icon_file($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n"); 
     555  //~ pwg_log('>>>>> pwg_icon_file($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n"); 
    556556   
    557557  global $conf, $pwg_conf; 
     
    559559  $error_log = ''; 
    560560   
     561  // Create thumbnail directory if not exists 
     562  if (!file_exists($file_dir.'/'.$conf['thumbs'])) 
     563  { 
     564    mkdir($file_dir.'/'.$conf['thumbs']); 
     565  } 
     566 
    561567  // Get original properties (width, height) 
    562568  if ($image_size = getimagesize($file_dir.'/'.$file_short.'.'.$file_ext)) 
     
    684690  $error_log .= $file_dir.'/'.$file_short.'.'.$file_ext.'</code><br />'."\n"; 
    685691 
    686   pwg_log('<<<<< pwg_icon_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n"); 
     692  //~ pwg_log('<<<<< pwg_icon_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n"); 
    687693  return $error_log;  
    688694} 
     
    697703function pwg_scan_file($file_full, &$line) 
    698704{ 
    699   pwg_log('>>>>> pwg_scan_file($file = '.var_export($file_full, TRUE).', $line = '.var_export($line, TRUE).') >>>>>'."\n"); 
     705  //~ pwg_log('>>>>> pwg_scan_file($file = '.var_export($file_full, TRUE).', $line = '.var_export($line, TRUE).') >>>>>'."\n"); 
    700706   
    701707  global $conf, $pwg_conf; 
     
    806812  } 
    807813   
    808   pwg_log('<<<<< pwg_scan_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n"); 
     814  //~ pwg_log('<<<<< pwg_scan_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n"); 
    809815  return $error_log; 
    810816} 
     
    817823function pwg_get_level($dir) 
    818824{ 
    819   pwg_log('>>>>> pwg_get_level($dir = '.var_export($dir, TRUE).') >>>>>'."\n"); 
     825  //~ pwg_log('>>>>> pwg_get_level($dir = '.var_export($dir, TRUE).') >>>>>'."\n"); 
    820826   
    821827  $level = substr_count($dir, '/') - 1; // -1 because of ./ at the beginning of path 
    822828   
    823   pwg_log('<<<<< pwg_get_level() returns '.var_export($level, TRUE).' <<<<<'."\n"); 
     829  //~ pwg_log('<<<<< pwg_get_level() returns '.var_export($level, TRUE).' <<<<<'."\n"); 
    824830  return $level; 
    825831} 
     
    833839function pwg_get_indent($element_type) 
    834840{ 
    835   pwg_log('>>>>> pwg_get_indent($element_type = '.var_export($element_type, TRUE).') >>>>>'."\n"); 
     841  //~ pwg_log('>>>>> pwg_get_indent($element_type = '.var_export($element_type, TRUE).') >>>>>'."\n"); 
    836842   
    837843  $level = substr_count($_SESSION['scan_list_fold'][0], '/') - 1; // because of ./ at the beginning 
     
    860866  } 
    861867   
    862   pwg_log('<<<<< pwg_get_indent() returns '.var_export(strlen($indent), TRUE).' spaces <<<<<'."\n"); 
     868  //~ pwg_log('<<<<< pwg_get_indent() returns '.var_export(strlen($indent), TRUE).' spaces <<<<<'."\n"); 
    863869  return $indent; 
    864870} 
     
    872878function pwg_protect_directories($directory) 
    873879{ 
    874   pwg_log('>>>>> pwg_protect_directories($directory = '.var_export($directory, true).') >>>>>'."\n"); 
     880  //~ pwg_log('>>>>> pwg_protect_directories($directory = '.var_export($directory, true).') >>>>>'."\n"); 
    875881   
    876882  global $conf; 
     
    906912  } 
    907913   
    908   pwg_log('<<<<< pwg_protect_directories() returns '.var_export($error_log, true).' <<<<<'."\n"); 
     914  //~ pwg_log('<<<<< pwg_protect_directories() returns '.var_export($error_log, true).' <<<<<'."\n"); 
    909915  return $error_log; 
    910916} 
     
    918924function pwg_get_file_extension($file) 
    919925{ 
    920   pwg_log('>>>>> pwg_get_file_extension($file = '.var_export($file, true).') >>>>>'."\n"); 
     926  //~ pwg_log('>>>>> pwg_get_file_extension($file = '.var_export($file, true).') >>>>>'."\n"); 
    921927   
    922928  $ext = substr(strrchr($file, '.'), 1, strlen ($file)); 
    923929   
    924   pwg_log('<<<<< pwg_get_file_extension() returns '.var_export($ext, true).' <<<<<'."\n"); 
     930  //~ pwg_log('<<<<< pwg_get_file_extension() returns '.var_export($ext, true).' <<<<<'."\n"); 
    925931  return $ext; 
    926932} 
     
    934940function pwg_get_file_list($directory) 
    935941{ 
    936   pwg_log('>>>>> pwg_get_file_list($directory = '.var_export($directory, true).') >>>>>'."\n"); 
     942  //~ pwg_log('>>>>> pwg_get_file_list($directory = '.var_export($directory, true).') >>>>>'."\n"); 
    937943   
    938944  global $conf, $pwg_conf; 
     
    950956          // The file pointed is a regular file with a supported extension 
    951957          array_push($_SESSION['scan_list_file'], $directory.'/'.$file); 
    952           pwg_log('--->> Push in $_SESSION[scan_list_file] value "'.$directory.'/'.$file.'"'."\n"); 
     958          //~ pwg_log('--->> Push in $_SESSION[scan_list_file] value "'.$directory.'/'.$file.'"'."\n"); 
    953959          if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $file)) 
    954960          { 
     
    966972          // The file pointed is a directory but neither system directory nor reserved by PWG 
    967973          array_push($_SESSION['scan_list_fold'], $directory.'/'.$file); 
    968           pwg_log('--->> Push in $_SESSION[scan_list_fold] value "'.$directory.'/'.$file.'"'."\n"); 
     974          //~ pwg_log('--->> Push in $_SESSION[scan_list_fold] value "'.$directory.'/'.$file.'"'."\n"); 
    969975          if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $file)) 
    970976          { 
     
    990996  closedir($dir); 
    991997   
    992   pwg_log('<<<<< pwg_get_file_list() returns '.var_export($errorLog, true).' <<<<<'."\n"); 
     998  //~ pwg_log('<<<<< pwg_get_file_list() returns '.var_export($errorLog, true).' <<<<<'."\n"); 
    993999 
    9941000  return $errorLog; 
     
    10041010function pwg_get_moment() 
    10051011{ 
    1006   pwg_log('>>>>> pwg_get_moment() >>>>>'."\n"); 
     1012  //~ pwg_log('>>>>> pwg_get_moment() >>>>>'."\n"); 
    10071013   
    10081014  $t1 = explode(' ', microtime()); 
     
    10101016  $t2 = $t1[1].'.'.$t2[1]; 
    10111017 
    1012   pwg_log('<<<<< pwg_get_moment() returns '.var_export($t2, true).' <<<<<'."\n"); 
     1018  //~ pwg_log('<<<<< pwg_get_moment() returns '.var_export($t2, true).' <<<<<'."\n"); 
    10131019  return $t2; 
    10141020} 
     
    10231029  global $pwg_conf; 
    10241030 
    1025   pwg_log('>>>>> pwg_referer_is_me() >>>>>'."\n"); 
     1031  //~ pwg_log('>>>>> pwg_referer_is_me() >>>>>'."\n"); 
    10261032   
    10271033  $response = false; 
     
    10321038  } 
    10331039 
    1034   pwg_log('<<<<< pwg_referer_is_me() returns '.var_export($response, true).' <<<<<'."\n"); 
     1040  //~ pwg_log('<<<<< pwg_referer_is_me() returns '.var_export($response, true).' <<<<<'."\n"); 
    10351041  return $response; 
    10361042} 
     
    10421048function pwg_test_start() 
    10431049{ 
    1044   pwg_log('>>>>> pwg_test_start() >>>>>'."\n"); 
     1050  //~ pwg_log('>>>>> pwg_test_start() >>>>>'."\n"); 
    10451051 
    10461052  global $g_message, $conf; 
     
    10631069  $_SESSION['scan_step'] = 'exit'; 
    10641070   
    1065   pwg_log('<<<<< pwg_test_start() <<<<<'."\n"); 
     1071  //~ pwg_log('<<<<< pwg_test_start() <<<<<'."\n"); 
    10661072} 
    10671073 
    10681074function pwg_test_exit() 
    10691075{ 
    1070   pwg_log('>>>>> pwg_test_exit() >>>>>'."\n"); 
     1076  //~ pwg_log('>>>>> pwg_test_exit() >>>>>'."\n"); 
    10711077 
    10721078  global $g_header, $g_message, $g_footer, $conf, $pwg_conf; 
     
    11271133  } 
    11281134   
    1129   pwg_log('<<<<< pwg_test_exit() <<<<<'."\n"); 
     1135  //~ pwg_log('<<<<< pwg_test_exit() <<<<<'."\n"); 
    11301136} 
    11311137 
    11321138function pwg_clean_start() 
    11331139{ 
    1134   pwg_log('>>>>> pwg_clean_start() >>>>>'."\n"); 
     1140  //~ pwg_log('>>>>> pwg_clean_start() >>>>>'."\n"); 
    11351141   
    11361142  global $g_message; 
     
    11471153  $_SESSION['scan_step'] = 'exit'; 
    11481154   
    1149   pwg_log('<<<<< pwg_clean_start() <<<<<'."\n"); 
     1155  //~ pwg_log('<<<<< pwg_clean_start() <<<<<'."\n"); 
    11501156} 
    11511157 
    11521158function pwg_clean_exit() 
    11531159{ 
    1154   pwg_log('>>>>> pwg_clean_exit() >>>>>'."\n"); 
     1160  //~ pwg_log('>>>>> pwg_clean_exit() >>>>>'."\n"); 
    11551161 
    11561162  global $g_header, $g_message, $g_footer, $conf, $pwg_conf; 
     
    11811187  } 
    11821188   
    1183   pwg_log('<<<<< pwg_clean_exit() <<<<<'."\n"); 
     1189  //~ pwg_log('<<<<< pwg_clean_exit() <<<<<'."\n"); 
    11841190} 
    11851191 
    11861192function pwg_generate_start() 
    11871193{ 
    1188   pwg_log('>>>>> pwg_generate_start() >>>>>'."\n"); 
    1189   pwg_log("GENARATE start >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE start >>>\n"); 
     1194  //~ pwg_log('>>>>> pwg_generate_start() >>>>>'."\n"); 
     1195  //~ pwg_log("GENARATE start >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE start >>>\n"); 
    11901196 
    11911197  global $g_listing, $pwg_conf, $conf; 
     
    12351241  } 
    12361242   
    1237   pwg_log("GENARATE start <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE start <<<\n"); 
    1238   pwg_log('<<<<< pwg_generate_start() <<<<<'."\n"); 
     1243  //~ pwg_log("GENARATE start <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE start <<<\n"); 
     1244  //~ pwg_log('<<<<< pwg_generate_start() <<<<<'."\n"); 
    12391245} 
    12401246 
    12411247function pwg_generate_list() 
    12421248{ 
    1243   pwg_log('>>>>> pwg_generate_list() >>>>>'."\n"); 
    1244   pwg_log("GENARATE list >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE list >>>\n"); 
     1249  //~ pwg_log('>>>>> pwg_generate_list() >>>>>'."\n"); 
     1250  //~ pwg_log("GENARATE list >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE list >>>\n"); 
    12451251   
    12461252  global $g_listing; 
     
    12631269  $_SESSION['scan_step'] = 'scan'; 
    12641270   
    1265   pwg_log("GENARATE list <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE list <<<\n"); 
    1266   pwg_log('<<<<< pwg_generate_list() <<<<<'."\n"); 
     1271  //~ pwg_log("GENARATE list <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE list <<<\n"); 
     1272  //~ pwg_log('<<<<< pwg_generate_list() <<<<<'."\n"); 
    12671273} 
    12681274 
    12691275function pwg_generate_scan() 
    12701276{ 
    1271   pwg_log('>>>>> pwg_generate_scan() >>>>>'."\n"); 
    1272   pwg_log("GENARATE scan >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE scan >>>\n"); 
     1277  //~ pwg_log('>>>>> pwg_generate_scan() >>>>>'."\n"); 
     1278  //~ pwg_log("GENARATE scan >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE scan >>>\n"); 
    12731279   
    12741280  global $g_listing, $conf; 
     
    12831289      fwrite($g_listing, $line); 
    12841290    } 
    1285     pwg_log('---<< Pull of $_SESSION[scan_list_file] value "'.$_SESSION['scan_list_file'][0].'"'."\n"); 
     1291    //~ pwg_log('---<< Pull of $_SESSION[scan_list_file] value "'.$_SESSION['scan_list_file'][0].'"'."\n"); 
    12861292    array_shift($_SESSION['scan_list_file']); 
    12871293    $_SESSION['scan_cnt_file']++; 
     
    12931299  } 
    12941300   
    1295   pwg_log("GENERATE scan <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE scan <<<\n"); 
    1296   pwg_log('<<<<< pwg_generate_scan() <<<<<'."\n"); 
     1301  //~ pwg_log("GENERATE scan <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE scan <<<\n"); 
     1302  //~ pwg_log('<<<<< pwg_generate_scan() <<<<<'."\n"); 
    12971303} 
    12981304 
    12991305function pwg_generate_prot() 
    13001306{ 
    1301   pwg_log('>>>>> pwg_generate_prot() >>>>>'."\n"); 
    1302   pwg_log("GENARATE prot >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE prot >>>\n"); 
     1307  //~ pwg_log('>>>>> pwg_generate_prot() >>>>>'."\n"); 
     1308  //~ pwg_log("GENARATE prot >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE prot >>>\n"); 
    13031309   
    13041310  global $conf, $g_listing; 
     
    13171323  if (isset($_SESSION['scan_list_fold'][1])) 
    13181324  { 
    1319     pwg_log('---<< Pull of $_SESSION[scan_list_fold] value "'.$_SESSION['scan_list_fold'][0].'"'."\n"); 
     1325    //~ pwg_log('---<< Pull of $_SESSION[scan_list_fold] value "'.$_SESSION['scan_list_fold'][0].'"'."\n"); 
    13201326    array_shift($_SESSION['scan_list_fold']); 
    13211327    $_SESSION['scan_cnt_fold']++; 
     
    13421348  } 
    13431349 
    1344   pwg_log("GENERATE prot <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE prot <<<\n"); 
    1345   pwg_log('<<<<< pwg_generate_prot() <<<<<'."\n"); 
     1350  //~ pwg_log("GENERATE prot <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE prot <<<\n"); 
     1351  //~ pwg_log('<<<<< pwg_generate_prot() <<<<<'."\n"); 
    13461352} 
    13471353 
    13481354function pwg_generate_stop() 
    13491355{ 
    1350   pwg_log('>>>>> pwg_generate_stop() >>>>>'."\n"); 
    1351   pwg_log("GENARATE stop >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE stop >>>\n"); 
     1356  //~ pwg_log('>>>>> pwg_generate_stop() >>>>>'."\n"); 
     1357  //~ pwg_log("GENARATE stop >>>\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE stop >>>\n"); 
    13521358   
    13531359  global $pwg_conf, $g_listing, $g_header, $g_message, $g_footer; 
     
    13701376  $_SESSION['scan_step'] = 'exit'; 
    13711377   
    1372   pwg_log("GENARATE stop <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE stop <<<\n"); 
    1373   pwg_log('<<<<< pwg_generate_stop() <<<<<'."\n"); 
     1378  //~ pwg_log("GENARATE stop <<<\n".var_export($_SESSION['scan_list_fold'], true)."\n".var_export($_SESSION['scan_list_file'], true)."\nGENERATE stop <<<\n"); 
     1379  //~ pwg_log('<<<<< pwg_generate_stop() <<<<<'."\n"); 
    13741380} 
    13751381 
     
    13851391function pwg_continue() 
    13861392{ 
    1387   pwg_log('>>>>> pwg_continue() >>>>>'."\n"); 
     1393  //~ pwg_log('>>>>> pwg_continue() >>>>>'."\n"); 
    13881394   
    13891395  global $conf, $pwg_conf, $g_refresh, $g_header, $g_message, $g_footer, $start_time; 
     
    14431449    } 
    14441450  } 
    1445   pwg_log('<<<<< pwg_continue() returns '.var_export($return, true).' <<<<<'."\n"); 
     1451  //~ pwg_log('<<<<< pwg_continue() returns '.var_export($return, true).' <<<<<'."\n"); 
    14461452   
    14471453  return $return; 
     
    14591465function pwg_init() 
    14601466{ 
    1461   pwg_log('>>>>> pwg_init() >>>>>'."\n"); 
     1467  //~ pwg_log('>>>>> pwg_init() >>>>>'."\n"); 
    14621468 
    14631469  global $g_message, $g_listing, $g_footer, $conf, $pwg_conf, $start_time; 
     
    14761482      $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n"; 
    14771483      $_SESSION['scan_step'] = 'exit'; 
    1478       pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
     1484      //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
    14791485      return; 
    14801486    } 
     
    15011507          $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n"; 
    15021508          $_SESSION['scan_step'] = 'exit'; 
    1503           pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
     1509          //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
    15041510          return; 
    15051511        } 
     
    15181524      $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n"; 
    15191525      $_SESSION['scan_step'] = 'exit'; 
    1520       pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
     1526      //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
    15211527      return; 
    15221528    } 
     
    15491555      $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n"; 
    15501556      $_SESSION['scan_step'] = 'exit'; 
    1551       pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
     1557      //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n"); 
    15521558      return; 
    15531559    } 
     
    15691575  } 
    15701576   
    1571   pwg_log('<<<<< pwg_init() success <<<<<'."\n"); 
     1577  //~ pwg_log('<<<<< pwg_init() success <<<<<'."\n"); 
    15721578} 
    15731579 
     
    15821588function pwg_exit() 
    15831589{ 
    1584   pwg_log('>>>>> pwg_exit() >>>>>'."\n"); 
     1590  //~ pwg_log('>>>>> pwg_exit() >>>>>'."\n"); 
    15851591   
    15861592  global $g_listing; 
     
    16131619  } 
    16141620   
    1615   pwg_log('<<<<< pwg_exit() <<<<<'."\n"); 
     1621  //~ pwg_log('<<<<< pwg_exit() <<<<<'."\n"); 
    16161622} 
    16171623 
Note: See TracChangeset for help on using the changeset viewer.