diff --git a/conf/extensions/search.defaults.php b/conf/extensions/search.defaults.php new file mode 100644 index 0000000000..b92b37603b --- /dev/null +++ b/conf/extensions/search.defaults.php @@ -0,0 +1,21 @@ + diff --git a/conf/extensions/search.structure.php b/conf/extensions/search.structure.php new file mode 100644 index 0000000000..5225d142d1 --- /dev/null +++ b/conf/extensions/search.structure.php @@ -0,0 +1,38 @@ +disabled = 0; + +$i18n = exponent_lang_loadFile('conf/extensions/search.structure.php'); + +return array( + $i18n['title'], + array( + 'SAVE_SEARCH_QUERIES'=>array( + 'title'=>$i18n['save_search_queries'], + 'description'=>$i18n['save_search_queries_desc'], + 'control'=>$ctl + ) + ) +); + +?> diff --git a/conf/extensions/simplenotes.defaults.php b/conf/extensions/simplenotes.defaults.php new file mode 100644 index 0000000000..56095bfdf9 --- /dev/null +++ b/conf/extensions/simplenotes.defaults.php @@ -0,0 +1,24 @@ + diff --git a/conf/extensions/simplenotes.structure.php b/conf/extensions/simplenotes.structure.php new file mode 100644 index 0000000000..0e04a9d672 --- /dev/null +++ b/conf/extensions/simplenotes.structure.php @@ -0,0 +1,50 @@ +array( + 'title'=>$i18n['simplenote_require_login'], + 'description'=>$i18n['simplenote_require_login_desc'], + 'control'=>new checkboxcontrol() + ), + 'SIMPLENOTE_REQUIRE_APPROVAL'=>array( + 'title'=>$i18n['simplenote_require_approval'], + 'description'=>$i18n['simplenote_require_approval_desc'], + 'control'=>new checkboxcontrol() + ), + 'SIMPLENOTE_REQUIRE_NOTIFICATION'=>array( + 'title'=>$i18n['simplenote_require_notification'], + 'description'=>$i18n['simplenote_require_notification_desc'], + 'control'=>new checkboxcontrol() + ), + 'SIMPLENOTE_NOTIFICATION_EMAIL'=>array( + 'title'=>$i18n['simplenote_require_notification_email'], + 'description'=>$i18n['simplenote_require_notification_email_desc'], + 'control'=>new textcontrol() + ), + ) +); + +?> diff --git a/cron/.htaccess b/cron/.htaccess new file mode 100644 index 0000000000..aa9b2f6f19 --- /dev/null +++ b/cron/.htaccess @@ -0,0 +1,3 @@ +# secure directory by disabling script execution +# AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi +Options -ExecCGI diff --git a/cron/bootstrap.php b/cron/bootstrap.php new file mode 100644 index 0000000000..bc616485ee --- /dev/null +++ b/cron/bootstrap.php @@ -0,0 +1,58 @@ +connect(DB_USER, DB_PASS, DB_HOST.':'.DB_PORT, DB_NAME); + +?> diff --git a/cron/error_log b/cron/error_log new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/cron/error_log @@ -0,0 +1 @@ + diff --git a/cron/generateSiteMap.php b/cron/generateSiteMap.php new file mode 100644 index 0000000000..09fc2903a4 --- /dev/null +++ b/cron/generateSiteMap.php @@ -0,0 +1,144 @@ +".chr(13).chr(10); + $content.="".chr(13).chr(10); + + if (is_writable($filename)) + { + if (!$handle = fopen($filename, 'w')) { + echo "Cannot open file ($filename)"; + exit; + } + // Write$somecontent to our opened file. + if (fwrite($handle, $content) == FALSE) { + $action_msg = "ER"; + } + } + else + { + echo "$filename is not writeable."; + } + + $count=0; + $columns = ''; + + //$ps = new product(); + //$prodCount = $ps->find('count','parent_id=0 AND (availability_type=0 OR availability_type=1)'); + //print "\n" . $prodCount . "\n"; + //print "\n"; + + $sections = $db->selectObjectsBySql('SELECT sef_name FROM exponent_section WHERE public = 1 and active = 1'); + + //Sections + foreach ($sections as $item) { + + $columns = ''.chr(13).chr(10); + + + $columns.=''; + $columns.="http://www.militaryuniformsupply.com/".$item->sef_name; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= date('Y-m-d'); + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= "weekly"; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= "0.5"; + $columns.=''.chr(13).chr(10); + + $columns.=''.chr(13).chr(10); + $count++; + //size + // Write$somecontent to our opened file. + if (fwrite($handle, $columns.chr(13).chr(10)) == FALSE) { + $action_msg = "ER"; + } + } + + //Categories + $categories = $db->selectObjectsBySql('SELECT sef_url FROM exponent_storeCategories WHERE is_active = 1'); + foreach ($categories as $item) { + + $columns = ''.chr(13).chr(10); + + $columns.=''; + $columns.="http://www.militaryuniformsupply.com/".$item->sef_url; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= date('Y-m-d'); + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= "weekly"; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= "0.5"; + $columns.=''.chr(13).chr(10); + + $columns.=''.chr(13).chr(10); + $count++; + //size + // Write$somecontent to our opened file. + if (fwrite($handle, $columns.chr(13).chr(10)) == FALSE) { + $action_msg = "ER"; + } + } + + + //Products + $products = $db->selectObjectsBySql("SELECT sef_url FROM exponent_product WHERE (active_type = 0 or active_type = 1) and parent_id = 0"); + foreach ($products as $item) { + + $columns = ''.chr(13).chr(10); + + $columns.=''; + $columns.="http://www.militaryuniformsupply.com/".$item->sef_url; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= date('Y-m-d'); + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= "weekly"; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= "0.5"; + $columns.=''.chr(13).chr(10); + + $columns.=''.chr(13).chr(10); + $count++; + //size + // Write$somecontent to our opened file. + if (fwrite($handle, $columns.chr(13).chr(10)) == FALSE) { + $action_msg = "ER"; + } + } + + $content=''.chr(13).chr(10); + + // Write$somecontent to our opened file. + if (fwrite($handle, $content) == FALSE) { + $action_msg = "ER"; + } + $action_msg = "SC"; + fclose($handle); + echo "\r\nGenerated $count products in the feed.\r\n"; + +?> \ No newline at end of file diff --git a/cron/generateXMLFeed.php b/cron/generateXMLFeed.php new file mode 100644 index 0000000000..4c7cee1d38 --- /dev/null +++ b/cron/generateXMLFeed.php @@ -0,0 +1,289 @@ +".chr(13).chr(10); + $content.="".chr(13).chr(10); + $content.=''.chr(13).chr(10); + $content.='Military Uniform Supply'.chr(13).chr(10); + $content.='http://www.militaryuniformsupply.com'.chr(13).chr(10); + $content.='Military Uniform Supply and Military Clothing Sales, including BDUs, DCUs, ACUs, ABUs Multicam, combat boots, and more.'.chr(13).chr(10); + + if (is_writable($filename)) + { + if (!$handle = fopen($filename, 'w')) { + echo "Cannot open file ($filename)"; + exit; + } + // Write$somecontent to our opened file. + if (fwrite($handle, $content) == FALSE) { + $action_msg = "ER"; + } + } + else + { + echo "$filename is not writeable."; + } + + $count=0; + $columns = ''; + + //$ps = new product(); + //$prodCount = $ps->find('count','parent_id=0 AND (availability_type=0 OR availability_type=1)'); + //print "\n" . $prodCount . "\n"; + //print "\n"; + + $products = $db->selectObjectsBySql('SELECT DISTINCT(p.id),active_type,availability_type,quantity, model,feed_title,feed_body,sef_url,base_price,use_special_price, special_price,f.directory,f.filename, c.title as company FROM exponent_product p + LEFT JOIN exponent_content_expFiles cf ON + p.id = cf.content_id + LEFT JOIN exponent_expFiles f ON + cf.expfiles_id = f.id + LEFT JOIN exponent_companies c ON + c.id = p.companies_id + WHERE parent_id=0 AND (availability_type=0 OR availability_type=1 OR availability_type=2) AND(active_type=0 OR active_type=1) AND sef_url != "" AND cf.subtype="mainimage" ORDER BY p.title ASC'); + + //echo "Count: " . count($products); + /*for($x=0; $x< =10; $x++) + { + $products = $ps->find('all','parent_id=0 AND (availability_type=0 OR availability_type=1)','id DESC',10,$count); + $columns = ''; Multicam¢ + */ + //$counter=''; + $counter = array(); + $prodflipper[] = array(); + $prodflipper2[] = array(); + $prodflipper3[] = array(); + echo "\r\nPre Count: " . count($products). "\r\n";; + + foreach ($products as $p1) + { + $prodflipper[$p1->id] = $p1; + } + echo "Flip Count 1: " . count($prodflipper). "\r\n";; + + foreach ($prodflipper as $p2) + { + $prodflipper2[$p2->sef_url] = $p2; + } + echo "Flip Count 2: " . count($prodflipper2). "\r\n";; + + foreach ($prodflipper2 as $p3) + { + $prodflipper3[$p3->model] = $p3; + } + echo "Flip Count 3: " . count($prodflipper3). "\r\n";; + + foreach ($prodflipper3 as $prod) + { + if (empty($prod->sef_url) || empty($prod->feed_title) || empty($prod->model) || empty($prod->feed_body)) continue; + + if(in_array($prod->sef_url,$counter) || isset($counter[$prod->id])) + { + echo "No no..." . $prod->id . "\r\n"; + continue; + } + else + $counter[$prod->id] = $prod->sef_url; + + $count++; + //Get the google type categories, I used selectArraysBySql since a product can have more than 1 google taxonomy + $google_types_res = $db->selectArraysBySql("SELECT exponent_google_product_types.title FROM exponent_google_product_types, exponent_product, exponent_product_storeCategories, exponent_google_product_types_storeCategories + WHERE exponent_google_product_types.id = google_product_types_id and exponent_google_product_types_storeCategories.storecategories_id = exponent_product_storeCategories.storecategories_id and + exponent_product.id = exponent_product_storeCategories.product_id and exponent_product.id = {$prod->id}"); + $google_types = ''; + + if(count($google_types_res) > 0) { + $google_types_array = array(); + foreach($google_types_res as $item) { + $google_types_array[] = $item['title']; + } + $google_types = implode(' > ', $google_types_array); + } + + + $columns = ''.chr(13).chr(10); + + $columns.=''; + $prod->feed_title = parseAndTrim(html_entity_decode(strip_tags($prod->feed_title))); + $prod->feed_title = htmlspecialchars($prod->feed_title); + $prod->feed_title = onlyreadables($prod->feed_title); + //if(ctype_upper($prod->feed_title)) + //{ + //$prod->feed_title = ucwords(strtolower($prod->feed_title)); + //echo "Updated...:"; + //} + //echo $prod->feed_title .chr(13).chr(10); + //continue; + + $columns.= $prod->feed_title; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.="http://www.militaryuniformsupply.com/".strip_tags($prod->sef_url); + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= str_ireplace('&','',$prod->feed_body); + $columns.=''.chr(13).chr(10); + + //eDebug($prod); + //$prod->getAssociatedObjects(); + + $columns.=''; + $columns.= "http://www.militaryuniformsupply.com/".$prod->directory . $prod->filename; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.= $prod->base_price; + $columns.=''.chr(13).chr(10); + + if($prod->use_special_price && !empty($prod->special_price)) + { + $columns.=''; + $columns.= $prod->special_price; + $columns.=''.chr(13).chr(10); + } + + $columns.=''; + $columns.='new'; + $columns.=''.chr(13).chr(10); + + $columns.=''; + $columns.=str_ireplace('&','&',$prod->model); + $columns.=''.chr(13).chr(10); + + if(!empty($prod->company)) + { + $columns.=''; + $columns.=$prod->company; + $columns.=''.chr(13).chr(10); + } + + if($prod->active_type == 0) + { + if ($prod->availability_type == 0) + { + $columns.='in stock'.chr(13).chr(10); + $columns.='99'.chr(13).chr(10); + } + else if ($prod->availability_type == 1) + { + $columns.='limited availability'.chr(13).chr(10); + } + else if ($prod->availability_type == 2 && $prod->quantity <= 0) + { + $columns.='out of stock'.chr(13).chr(10); + $columns.='0'.chr(13).chr(10); + } + else if ($prod->availability_type == 2 && $prod->quantity > 0) + { + $columns.='in stock'.chr(13).chr(10); + $columns.=''.$prod->quantity. ''.chr(13).chr(10); + } + } + else if ($prod->active_type == 1) + { + $columns.='out of stock'.chr(13).chr(10); + $columns.='0'.chr(13).chr(10); + } + + if(!empty($google_types)) { + $columns.=''; + $columns.= parseAndTrim($google_types); + $columns.=''.chr(13).chr(10); + } + //$breadcrumb = $prod->storeCategory[0]->getEcomSubcategories(); + //eDebug($breadcrumb,true); + $columns.=''.chr(13).chr(10); + + //size + // Write$somecontent to our opened file. + if (fwrite($handle, $columns.chr(13).chr(10)) == FALSE) { + $action_msg = "ER"; + } + } + //} + + $content=''.chr(13).chr(10); + $content.=''.chr(13).chr(10); + + // Write$somecontent to our opened file. + if (fwrite($handle, $content) == FALSE) { + $action_msg = "ER"; + } + $action_msg = "SC"; + fclose($handle); + echo "\r\nGenerated $count products in the feed.\r\n"; + + function parseAndTrim($str) + { + $str = str_replace("
","",$str); + $str = str_replace("
","",$str); + $str = str_replace("
","",$str); + $str = str_replace("
","",$str); + $str = str_replace(""",'"',$str); + $str = str_replace("'","'",$str); + $str = str_replace("’","'",$str); + $str = str_replace("‘","'",$str); + $str = str_replace("®","",$str); + $str = str_replace("–","-", $str); + $str = str_replace("—","-", $str); + $str = str_replace("”", '"', $str); + $str = str_replace("”",'"', $str); + $str = str_replace("“", '"', $str); + $str = str_replace("“",'"', $str); + $str = str_replace("\r\n"," ",$str); + $str = str_replace("¼"," 1/4",$str); + $str = str_replace("¼"," 1/4", $str); + $str = str_replace("½"," 1/2",$str); + $str = str_replace("½"," 1/2",$str); + $str = str_replace("¾"," 3/4",$str); + $str = str_replace("¾"," 3/4",$str); + $str = str_replace("™", "(TM)", $str); + $str = str_replace("™","(TM)", $str); + $str = str_replace("®","(R)", $str); + $str = str_replace("®","(R)",$str); + $str = str_replace("&","&",$str); + $str = str_replace(">",">",$str); + return trim($str); + } + + function pullTitle(&$prod) + { + $prod->feed_title = str_ireplace('***CLOSEOUT***','',$prod->title); + $prod->feed_title = str_ireplace('CLEARANCE!!','',$prod->feed_title); + $prod->feed_title = str_ireplace('
','',$prod->feed_title); + $prod->feed_title = str_ireplace('- New Low Price Buy Here and Save','',$prod->feed_title); + $prod->feed_title = str_ireplace('- New Low Price. Buy Here and Save.','',$prod->feed_title); + $prod->feed_title = str_ireplace('- New Low Price.....Buy here and save','',$prod->feed_title); + $prod->feed_title = str_ireplace('New Low Price Buy Here and Save','',$prod->feed_title); + $prod->feed_title = str_ireplace('- New Low Price and Save','',$prod->feed_title); + $prod->feed_title = str_ireplace('- Overstock Sale Buy Now and Save','',$prod->feed_title); + $prod->feed_title = str_ireplace('- New Low Price','',$prod->feed_title); + $prod->feed_title = str_ireplace('New Low Price','',$prod->feed_title); + $prod->feed_title = str_ireplace('.......Buy here and save','',$prod->feed_title); + $prod->feed_title = str_ireplace('Buy Here and Save','',$prod->feed_title); + $prod->feed_title = str_ireplace('- SUPER SALE!','',$prod->feed_title); + $prod->feed_title = trim($prod->feed_title); + return $prod; + } + + + function onlyreadables($string) { + for ($i=0;$i126) { + $chr = "~"; + $string{$i} = $chr; + } + } + return str_replace("~", "", $string); + } +?> \ No newline at end of file diff --git a/exponent_common.php b/exponent_common.php index 547860ef3b..34fb69e08d 100644 --- a/exponent_common.php +++ b/exponent_common.php @@ -14,4 +14,4 @@ function __realpath($path) { // This was moved into its own file from this file so that 'lighter' scripts could bootstrap. include_once(dirname(__realpath(__FILE__)).'/exponent_bootstrap.php'); -?> +?> \ No newline at end of file diff --git a/external/barcode.php b/external/barcode.php new file mode 100644 index 0000000000..afc8292b18 --- /dev/null +++ b/external/barcode.php @@ -0,0 +1,351 @@ +=1 to enable + + + NOTE: You must have GD-1.8 or higher compiled into PHP + in order to use PNG and JPEG. GIF images only work with + GD-1.5 and lower. (http://www.boutell.com) + + + ANOTHER NOTE: If you actually intend to print the barcodes + and scan them with a scanner, I highly recommend choosing + JPEG with a quality of 100. Most browsers can't seem to print + a PNG without mangling it beyond recognition. + + + USAGE EXAMPLES FOR ANY PLAIN OLD HTML DOCUMENT: + ----------------------------------------------- + + + + + + + + +*/ +/*=============================================================================*/ + + +//----------------------------------------------------------------------------- +// Startup code +//----------------------------------------------------------------------------- + + +if(isset($_GET["text"])) $text=$_GET["text"]; +if(isset($_GET["format"])) $format=$_GET["format"]; +if(isset($_GET["quality"])) $quality=$_GET["quality"]; +if(isset($_GET["width"])) $width=$_GET["width"]; +if(isset($_GET["height"])) $height=$_GET["height"]; +if(isset($_GET["type"])) $type=$_GET["type"]; +if(isset($_GET["barcode"])) $barcode=$_GET["barcode"]; + + + + +if (!isset ($text)) $text = 1; +if (!isset ($type)) $type = 1; +if (empty ($quality)) $quality = 100; +if (empty ($width)) $width = 160; +if (empty ($height)) $height = 80; +if (!empty ($format)) $format = strtoupper ($format); + else $format="PNG"; + + +switch ($type) +{ + default: + $type = 1; + case 1: + Barcode39 ($barcode, $width, $height, $quality, $format, $text); + break; +} + + +//----------------------------------------------------------------------------- +// Generate a Code 3 of 9 barcode +//----------------------------------------------------------------------------- +function Barcode39 ($barcode, $width, $height, $quality, $format, $text) +{ + switch ($format) + { + default: + $format = "JPEG"; + case "JPEG": + header ("Content-type: image/jpeg"); + break; + case "PNG": + header ("Content-type: image/png"); + break; + case "GIF": + header ("Content-type: image/gif"); + break; + } + + + $im = ImageCreate ($width, $height) + or die ("Cannot Initialize new GD image stream"); + $White = ImageColorAllocate ($im, 255, 255, 255); + $Black = ImageColorAllocate ($im, 0, 0, 0); + //ImageColorTransparent ($im, $White); + ImageInterLace ($im, 1); + + + + $NarrowRatio = 20; + $WideRatio = 55; + $QuietRatio = 35; + + + $nChars = (strlen($barcode)+2) * ((6 * $NarrowRatio) + (3 * $WideRatio) + ($QuietRatio)); + $Pixels = $width / $nChars; + $NarrowBar = (int)(20 * $Pixels); + $WideBar = (int)(55 * $Pixels); + $QuietBar = (int)(35 * $Pixels); + + + $ActualWidth = (($NarrowBar * 6) + ($WideBar*3) + $QuietBar) * (strlen ($barcode)+2); + + if (($NarrowBar == 0) || ($NarrowBar == $WideBar) || ($NarrowBar == $QuietBar) || ($WideBar == 0) || ($WideBar == $QuietBar) || ($QuietBar == 0)) + { + ImageString ($im, 1, 0, 0, "Image is too small!", $Black); + OutputImage ($im, $format, $quality); + exit; + } + + $CurrentBarX = (int)(($width - $ActualWidth) / 2); + $Color = $White; + $BarcodeFull = "*".strtoupper ($barcode)."*"; + settype ($BarcodeFull, "string"); + + $FontNum = 3; + $FontHeight = ImageFontHeight ($FontNum); + $FontWidth = ImageFontWidth ($FontNum); + if ($text != 0) + { + $CenterLoc = (int)(($width-1) / 2) - (int)(($FontWidth * strlen($BarcodeFull)) / 2); + ImageString ($im, $FontNum, $CenterLoc, $height-$FontHeight, "$BarcodeFull", $Black); + } + else + { + $FontHeight=-2; + } + + + for ($i=0; $i diff --git a/install/pages/install-4.php b/install/pages/install-4.php index 74736ff51d..170d279723 100644 --- a/install/pages/install-4.php +++ b/install/pages/install-4.php @@ -54,7 +54,7 @@ - + diff --git a/modules/loginmodule/views/Default.tpl b/modules/loginmodule/views/Default.tpl index 25c66e4ad8..c9a959ac7a 100644 --- a/modules/loginmodule/views/Default.tpl +++ b/modules/loginmodule/views/Default.tpl @@ -23,32 +23,33 @@ {/if} {if $smarty.const.SITE_ALLOW_REGISTRATION == 1} - {css unique="regbox"} - {literal} - .box { - display:inline-block; - *display:inline; - zoom:1; - width:49%; - vertical-align:top; - } - - {/literal} - {/css} + {css unique="regbox"} + {literal} + .box { + display:inline-block; + *display:inline; + zoom:1; + width:49%; + vertical-align:top; + } + + {/literal} + {/css} - -
-

{"New"|gettext} {$usertype}

-

- {if $isecom} - {"If you are a new customer please create an account to continue in the checkout process. - Creating an account will allow you to save your billing and shipping information and track your order status."|gettext}{br}{br} - {else} - {* should put some basic text here*} - {/if} - {"Create an Account"|gettext} -

-
+ +
+

{"New"|gettext} {$usertype}

+

+ {if $isecom} + {"If you are a new customer, select this option to continue with the checkout process."|gettext}{br}{br} + {"We will gather billing and shipping information, and you will have the option to create an account so can track your order status."|gettext}{br}{br} + {" - Click Here to Continue Checking Out - "|gettext} + {else} + {"Create a new account here."|gettext} + {"Create an Account"|gettext} + {/if} +

+
{/if} {/if} diff --git a/thumb.php b/thumb.php index 9a5cedca23..1ee7cec02c 100644 --- a/thumb.php +++ b/thumb.php @@ -15,41 +15,25 @@ # GPL: http://www.gnu.org/licenses/gpl.txt # ################################################## - -if (defined('EXPONENT')) return; - +if (defined('EXPONENT')) return; // bootstrap some exponenty goodness -include_once('exponent_bootstrap.php'); - +include_once('exponent_bootstrap.php'); // Since bootstrap doesn't setup the session we need to define this // otherwise the expFile can't find it's table desc from cache. -if (!defined('SYS_SESSION_KEY')) define('SYS_SESSION_KEY',PATH_RELATIVE); - - -//if (empty($_GET['lgcy'])) { - // we're dealing with phpThumb, not the oldschool thumnailer - - // - if (isset($_GET['id'])) { +if (!defined('SYS_SESSION_KEY')) define('SYS_SESSION_KEY',PATH_RELATIVE); + if (isset($_GET['id'])) { include_once('subsystems/autoloader.php'); include_once('subsystems/config/load.php'); // Initialize the Database Subsystem include_once(BASE.'subsystems/database.php'); $db = exponent_database_connect(DB_USER,DB_PASS,DB_HOST.':'.DB_PORT,DB_NAME); - $file_obj = new expFile($_GET['id']); - $_GET['src'] = $file_obj->directory.$file_obj->filename; - + $file_obj = new expFile($_GET['id']); + //$_GET['src'] = "/" . $file_obj->directory.$file_obj->filename; + $_GET['src'] = $file_obj->path; + unset($_GET['id']); unset($_GET['square']); - } - - - + } require(BASE."external/phpThumb/phpThumb.php"); -//} else{ - // we're dealing with the old school thumnailer -// require(BASE."expLegacyThumb.php"); -//}; - ?>