Changeset 5007 for branches


Ignore:
Timestamp:
Mar 1, 2010, 11:19:16 AM (14 years ago)
Author:
laurent.duretz
Message:

Adding JPG support on Wamp server : Wamp server gd_info() method return "JPEG Support" instead "JPG Support"

File:
1 edited

Legend:

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

    r4036 r5007  
    9494// ****** Thumbnails generation functionality ****** //
    9595// Define if images have to be reduced if they are not
    96 $conf['thumbnail'] = false;
     96$conf['thumbnail'] = true;
    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;
     
    208208   
    209209    // Backup input/output format support
    210     array_push($pwg_conf['gd_supported_format'], $info['JPG Support'] ? 'jpeg' : NULL);
     210    array_push($pwg_conf['gd_supported_format'], $info['JPG Support'] or $info['JPEG Support'] ? 'jpeg' : NULL);
    211211    array_push($pwg_conf['gd_supported_format'], $info['PNG Support'] ? 'png' : NULL);
    212212    array_push($pwg_conf['gd_supported_format'], ($info['GIF Read Support'] and $info['GIF Create Support']) ? 'gif' : NULL);
     
    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;
     
    684684  $error_log .= $file_dir.'/'.$file_short.'.'.$file_ext.'</code><br />'."\n";
    685685
    686   //~ pwg_log('<<<<< pwg_icon_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n");
     686  pwg_log('<<<<< pwg_icon_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n");
    687687  return $error_log;
    688688}
     
    697697function pwg_scan_file($file_full, &$line)
    698698{
    699   //~ pwg_log('>>>>> pwg_scan_file($file = '.var_export($file_full, TRUE).', $line = '.var_export($line, TRUE).') >>>>>'."\n");
     699  pwg_log('>>>>> pwg_scan_file($file = '.var_export($file_full, TRUE).', $line = '.var_export($line, TRUE).') >>>>>'."\n");
    700700 
    701701  global $conf, $pwg_conf;
     
    806806  }
    807807 
    808   //~ pwg_log('<<<<< pwg_scan_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n");
     808  pwg_log('<<<<< pwg_scan_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n");
    809809  return $error_log;
    810810}
     
    817817function pwg_get_level($dir)
    818818{
    819   //~ pwg_log('>>>>> pwg_get_level($dir = '.var_export($dir, TRUE).') >>>>>'."\n");
     819  pwg_log('>>>>> pwg_get_level($dir = '.var_export($dir, TRUE).') >>>>>'."\n");
    820820 
    821821  $level = substr_count($dir, '/') - 1; // -1 because of ./ at the beginning of path
    822822 
    823   //~ pwg_log('<<<<< pwg_get_level() returns '.var_export($level, TRUE).' <<<<<'."\n");
     823  pwg_log('<<<<< pwg_get_level() returns '.var_export($level, TRUE).' <<<<<'."\n");
    824824  return $level;
    825825}
     
    833833function pwg_get_indent($element_type)
    834834{
    835   //~ pwg_log('>>>>> pwg_get_indent($element_type = '.var_export($element_type, TRUE).') >>>>>'."\n");
     835  pwg_log('>>>>> pwg_get_indent($element_type = '.var_export($element_type, TRUE).') >>>>>'."\n");
    836836 
    837837  $level = substr_count($_SESSION['scan_list_fold'][0], '/') - 1; // because of ./ at the beginning
     
    860860  }
    861861 
    862   //~ pwg_log('<<<<< pwg_get_indent() returns '.var_export(strlen($indent), TRUE).' spaces <<<<<'."\n");
     862  pwg_log('<<<<< pwg_get_indent() returns '.var_export(strlen($indent), TRUE).' spaces <<<<<'."\n");
    863863  return $indent;
    864864}
     
    872872function pwg_protect_directories($directory)
    873873{
    874   //~ pwg_log('>>>>> pwg_protect_directories($directory = '.var_export($directory, true).') >>>>>'."\n");
     874  pwg_log('>>>>> pwg_protect_directories($directory = '.var_export($directory, true).') >>>>>'."\n");
    875875 
    876876  global $conf;
     
    906906  }
    907907 
    908   //~ pwg_log('<<<<< pwg_protect_directories() returns '.var_export($error_log, true).' <<<<<'."\n");
     908  pwg_log('<<<<< pwg_protect_directories() returns '.var_export($error_log, true).' <<<<<'."\n");
    909909  return $error_log;
    910910}
     
    918918function pwg_get_file_extension($file)
    919919{
    920   //~ pwg_log('>>>>> pwg_get_file_extension($file = '.var_export($file, true).') >>>>>'."\n");
     920  pwg_log('>>>>> pwg_get_file_extension($file = '.var_export($file, true).') >>>>>'."\n");
    921921 
    922922  $ext = substr(strrchr($file, '.'), 1, strlen ($file));
    923923 
    924   //~ pwg_log('<<<<< pwg_get_file_extension() returns '.var_export($ext, true).' <<<<<'."\n");
     924  pwg_log('<<<<< pwg_get_file_extension() returns '.var_export($ext, true).' <<<<<'."\n");
    925925  return $ext;
    926926}
     
    934934function pwg_get_file_list($directory)
    935935{
    936   //~ pwg_log('>>>>> pwg_get_file_list($directory = '.var_export($directory, true).') >>>>>'."\n");
     936  pwg_log('>>>>> pwg_get_file_list($directory = '.var_export($directory, true).') >>>>>'."\n");
    937937 
    938938  global $conf, $pwg_conf;
     
    950950          // The file pointed is a regular file with a supported extension
    951951          array_push($_SESSION['scan_list_file'], $directory.'/'.$file);
    952           //~ pwg_log('--->> Push in $_SESSION[scan_list_file] value "'.$directory.'/'.$file.'"'."\n");
     952          pwg_log('--->> Push in $_SESSION[scan_list_file] value "'.$directory.'/'.$file.'"'."\n");
    953953          if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $file))
    954954          {
     
    966966          // The file pointed is a directory but neither system directory nor reserved by PWG
    967967          array_push($_SESSION['scan_list_fold'], $directory.'/'.$file);
    968           //~ pwg_log('--->> Push in $_SESSION[scan_list_fold] value "'.$directory.'/'.$file.'"'."\n");
     968          pwg_log('--->> Push in $_SESSION[scan_list_fold] value "'.$directory.'/'.$file.'"'."\n");
    969969          if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $file))
    970970          {
     
    990990  closedir($dir);
    991991 
    992   //~ pwg_log('<<<<< pwg_get_file_list() returns '.var_export($errorLog, true).' <<<<<'."\n");
     992  pwg_log('<<<<< pwg_get_file_list() returns '.var_export($errorLog, true).' <<<<<'."\n");
    993993
    994994  return $errorLog;
     
    10041004function pwg_get_moment()
    10051005{
    1006   //~ pwg_log('>>>>> pwg_get_moment() >>>>>'."\n");
     1006  pwg_log('>>>>> pwg_get_moment() >>>>>'."\n");
    10071007 
    10081008  $t1 = explode(' ', microtime());
     
    10101010  $t2 = $t1[1].'.'.$t2[1];
    10111011
    1012   //~ pwg_log('<<<<< pwg_get_moment() returns '.var_export($t2, true).' <<<<<'."\n");
     1012  pwg_log('<<<<< pwg_get_moment() returns '.var_export($t2, true).' <<<<<'."\n");
    10131013  return $t2;
    10141014}
     
    10231023  global $pwg_conf;
    10241024
    1025   //~ pwg_log('>>>>> pwg_referer_is_me() >>>>>'."\n");
     1025  pwg_log('>>>>> pwg_referer_is_me() >>>>>'."\n");
    10261026 
    10271027  $response = false;
     
    10321032  }
    10331033
    1034   //~ pwg_log('<<<<< pwg_referer_is_me() returns '.var_export($response, true).' <<<<<'."\n");
     1034  pwg_log('<<<<< pwg_referer_is_me() returns '.var_export($response, true).' <<<<<'."\n");
    10351035  return $response;
    10361036}
     
    10421042function pwg_test_start()
    10431043{
    1044   //~ pwg_log('>>>>> pwg_test_start() >>>>>'."\n");
     1044  pwg_log('>>>>> pwg_test_start() >>>>>'."\n");
    10451045
    10461046  global $g_message, $conf;
     
    10631063  $_SESSION['scan_step'] = 'exit';
    10641064 
    1065   //~ pwg_log('<<<<< pwg_test_start() <<<<<'."\n");
     1065  pwg_log('<<<<< pwg_test_start() <<<<<'."\n");
    10661066}
    10671067
    10681068function pwg_test_exit()
    10691069{
    1070   //~ pwg_log('>>>>> pwg_test_exit() >>>>>'."\n");
     1070  pwg_log('>>>>> pwg_test_exit() >>>>>'."\n");
    10711071
    10721072  global $g_header, $g_message, $g_footer, $conf, $pwg_conf;
     
    10971097      $format = ($info['GIF Create Support']) ? '<code>gif</code>' : NULL;
    10981098      array_push($format_list, $format);
    1099       $format = ($info['JPG Support']) ? '<code>jpg</code>' : NULL;
     1099      $format = ($info['JPG Support'] or $info['JPEG Support']) ? '<code>jpg</code>' : NULL;
    11001100      array_push($format_list, $format);
    11011101      $format = ($info['PNG Support']) ? '<code>png</code>' : NULL;
     
    11271127  }
    11281128 
    1129   //~ pwg_log('<<<<< pwg_test_exit() <<<<<'."\n");
     1129  pwg_log('<<<<< pwg_test_exit() <<<<<'."\n");
    11301130}
    11311131
    11321132function pwg_clean_start()
    11331133{
    1134   //~ pwg_log('>>>>> pwg_clean_start() >>>>>'."\n");
     1134  pwg_log('>>>>> pwg_clean_start() >>>>>'."\n");
    11351135 
    11361136  global $g_message;
     
    11471147  $_SESSION['scan_step'] = 'exit';
    11481148 
    1149   //~ pwg_log('<<<<< pwg_clean_start() <<<<<'."\n");
     1149  pwg_log('<<<<< pwg_clean_start() <<<<<'."\n");
    11501150}
    11511151
    11521152function pwg_clean_exit()
    11531153{
    1154   //~ pwg_log('>>>>> pwg_clean_exit() >>>>>'."\n");
     1154  pwg_log('>>>>> pwg_clean_exit() >>>>>'."\n");
    11551155
    11561156  global $g_header, $g_message, $g_footer, $conf, $pwg_conf;
     
    11811181  }
    11821182 
    1183   //~ pwg_log('<<<<< pwg_clean_exit() <<<<<'."\n");
     1183  pwg_log('<<<<< pwg_clean_exit() <<<<<'."\n");
    11841184}
    11851185
    11861186function pwg_generate_start()
    11871187{
    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");
     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");
    11901190
    11911191  global $g_listing, $pwg_conf, $conf;
     
    12351235  }
    12361236 
    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");
     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");
    12391239}
    12401240
    12411241function pwg_generate_list()
    12421242{
    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");
     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");
    12451245 
    12461246  global $g_listing;
     
    12631263  $_SESSION['scan_step'] = 'scan';
    12641264 
    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");
     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");
    12671267}
    12681268
    12691269function pwg_generate_scan()
    12701270{
    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");
     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");
    12731273 
    12741274  global $g_listing, $conf;
     
    12831283      fwrite($g_listing, $line);
    12841284    }
    1285     //~ pwg_log('---<< Pull of $_SESSION[scan_list_file] value "'.$_SESSION['scan_list_file'][0].'"'."\n");
     1285    pwg_log('---<< Pull of $_SESSION[scan_list_file] value "'.$_SESSION['scan_list_file'][0].'"'."\n");
    12861286    array_shift($_SESSION['scan_list_file']);
    12871287    $_SESSION['scan_cnt_file']++;
     
    12931293  }
    12941294 
    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");
     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");
    12971297}
    12981298
    12991299function pwg_generate_prot()
    13001300{
    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");
     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");
    13031303 
    13041304  global $conf, $g_listing;
     
    13171317  if (isset($_SESSION['scan_list_fold'][1]))
    13181318  {
    1319     //~ pwg_log('---<< Pull of $_SESSION[scan_list_fold] value "'.$_SESSION['scan_list_fold'][0].'"'."\n");
     1319    pwg_log('---<< Pull of $_SESSION[scan_list_fold] value "'.$_SESSION['scan_list_fold'][0].'"'."\n");
    13201320    array_shift($_SESSION['scan_list_fold']);
    13211321    $_SESSION['scan_cnt_fold']++;
     
    13421342  }
    13431343
    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");
     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");
    13461346}
    13471347
    13481348function pwg_generate_stop()
    13491349{
    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");
     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");
    13521352 
    13531353  global $pwg_conf, $g_listing, $g_header, $g_message, $g_footer;
     
    13701370  $_SESSION['scan_step'] = 'exit';
    13711371 
    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");
     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");
    13741374}
    13751375
     
    13851385function pwg_continue()
    13861386{
    1387   //~ pwg_log('>>>>> pwg_continue() >>>>>'."\n");
     1387  pwg_log('>>>>> pwg_continue() >>>>>'."\n");
    13881388 
    13891389  global $conf, $pwg_conf, $g_refresh, $g_header, $g_message, $g_footer, $start_time;
     
    14431443    }
    14441444  }
    1445   //~ pwg_log('<<<<< pwg_continue() returns '.var_export($return, true).' <<<<<'."\n");
     1445  pwg_log('<<<<< pwg_continue() returns '.var_export($return, true).' <<<<<'."\n");
    14461446 
    14471447  return $return;
     
    14591459function pwg_init()
    14601460{
    1461   //~ pwg_log('>>>>> pwg_init() >>>>>'."\n");
     1461  pwg_log('>>>>> pwg_init() >>>>>'."\n");
    14621462
    14631463  global $g_message, $g_listing, $g_footer, $conf, $pwg_conf, $start_time;
     
    14761476      $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n";
    14771477      $_SESSION['scan_step'] = 'exit';
    1478       //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
     1478      pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
    14791479      return;
    14801480    }
     
    15011501          $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n";
    15021502          $_SESSION['scan_step'] = 'exit';
    1503           //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
     1503          pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
    15041504          return;
    15051505        }
     
    15181518      $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n";
    15191519      $_SESSION['scan_step'] = 'exit';
    1520       //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
     1520      pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
    15211521      return;
    15221522    }
     
    15491549      $g_footer   = '<a href="'.$pwg_conf['this_url'].'" title="Main menu"><img src="'.$pwg_conf['icon_dir'].'up.png" /></a>'."\n";
    15501550      $_SESSION['scan_step'] = 'exit';
    1551       //~ pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
     1551      pwg_log('<<<<< pwg_init() failure <<<<<'."\n");
    15521552      return;
    15531553    }
     
    15691569  }
    15701570 
    1571   //~ pwg_log('<<<<< pwg_init() success <<<<<'."\n");
     1571  pwg_log('<<<<< pwg_init() success <<<<<'."\n");
    15721572}
    15731573
     
    15821582function pwg_exit()
    15831583{
    1584   //~ pwg_log('>>>>> pwg_exit() >>>>>'."\n");
     1584  pwg_log('>>>>> pwg_exit() >>>>>'."\n");
    15851585 
    15861586  global $g_listing;
     
    16131613  }
    16141614 
    1615   //~ pwg_log('<<<<< pwg_exit() <<<<<'."\n");
     1615  pwg_log('<<<<< pwg_exit() <<<<<'."\n");
    16161616}
    16171617
Note: See TracChangeset for help on using the changeset viewer.