Merge branch 'master' of https://github.com/short-pixel-optimizer/shortpixel-web

# Conflicts: #	lib/ShortPixelWeb.php

Author: AddisonFreeman

lib/ShortPixelWeb.php

@@ -6,7 +6,7 @@
  */
 namespace ShortPixelWeb;
 
-const WEB_VERSION = "1.0.1";
+const WEB_VERSION = "1.0.2";
 
 
 use ShortPixelWeb\XTemplate;
@@ -17,10 +17,12 @@ class ShortPixelWeb
 {
  private $settingsHandler;
  private $xtpl;
+ private $basePath;
 
  function __construct() {
  $this->xtpl = new XTemplate('main.html', __DIR__ . '/ShortPixelWeb/tpl');
  $this->settingsHandler = new \ShortPixel\Settings(dirname(__DIR__). '/shortpixel.ini');
+ $this->basePath = str_replace(DIRECTORY_SEPARATOR, '/', dirname(dirname(__DIR__))); // get that damn separator straight on Windows too :))
  }
 
  function bootstrap() {
@@ -74,8 +76,7 @@ function pathToRelative($path, $reference) {
  }
 
  private function folderFullPath($folder) {
- $root = dirname(dirname(__DIR__));
- return rawurldecode($root.$folder );
+ return rawurldecode($this->basePath . $folder );
  }
 
  function renderFolderOptionsData($folder) {
@@ -180,6 +181,7 @@ function renderBrowseFolderFragment($folder, $multiSelect, $onlyFolders, $onlyFi
  $backupPath = $backupFolder . '/' . $file;
 
  if($backupFolder && $backupUrl && file_exists($backupPath)) {
+<<<<<<< HEAD
  preg_match_all('#/#', $backupDir,$matches, PREG_OFFSET_CAPTURE); 
  if(!empty($matches[0])) { //if a subfolder
  $start = $matches[0][0][1];
@@ -193,6 +195,9 @@ function renderBrowseFolderFragment($folder, $multiSelect, $onlyFolders, $onlyFi
  $originalUrl = $backupUrl . '/' . $backupDir .'/' . $file;
  }
 
+=======
+ $originalUrl = $backupUrl . '/' . $file; $optimizedUrl = $backupUrl . '/' . $file;
+>>>>>>> 63a71c3b46ea062883012eb7085df9d914610e3c
  echo "<a class='optimized-view' href='#' data-original='" . $originalUrl . "' data-optimized='" . $optimizedUrl . "' title='Compare images for " . $file . " (original vs. lossy)' style='display: inline;'>";
  echo "<span class='dashicons sp-eye-open' style='cursor:pointer;font-size:1.2em'></span>";
  echo "</a>";
@@ -240,7 +245,7 @@ function initJSConstants() {
  $username = $pwu_data['name'];
  }
  $this->xtpl->assign("current_os_user", $username);
- $this->xtpl->assign("shortpixel_os_path", dirname(dirname(__DIR__)));
+ $this->xtpl->assign("shortpixel_os_path", $this->basePath); // get that damn separator straight on Windows too :))
  $this->xtpl->assign("shortpixel_api_key", $this->settingsHandler->get("API_KEY"));
  }
 
@@ -267,7 +272,7 @@ function renderStartPage($messages) {
  function renderOptimizeNow($optData) {
  $folder = $optData['folder'];
  $exclude = array();
- $folderPath = $this->normalizePath(dirname(dirname(__DIR__)) . $folder);
+ $folderPath = $this->normalizePath($this->basePath . $folder);
  if(!strlen($folder)) {
  $this->renderStartPage(array('error' => "Please select a folder."));
  return;
@@ -288,7 +293,7 @@ function renderOptimizeNow($optData) {
  }
  }
  $this->setupWrapper($folderPath);
- $status = \ShortPixel\folderInfo(dirname(dirname(__DIR__)) . $folder, true, false, $exclude);
+ $status = \ShortPixel\folderInfo($this->basePath . $folder, true, false, $exclude);
  $this->xtpl->assign('folder', $folder);
 
  if( $status->status !== 'error'
@@ -333,7 +338,7 @@ function optimizeAction($folder, $slice) {
  $timeLimit = 60;
  }
 
- $folderPath = dirname(dirname(__DIR__)) . $folder;
+ $folderPath = $this->basePath . $folder; // get that damn separator straight on Windows too :))
  $this->setupWrapper($folderPath);
  $slice = $slice ? $slice : \ShortPixel\ShortPixel::MAX_ALLOWED_FILES_PER_CALL;