';
- echo '
, ')
';
+ echo '
, ')
';
echo '
';
echo '
Try with root domain / ';
echo '
Keep this thumbshot';
diff --git a/index.php b/index.php
index 9f3e61f..6dd6b0d 100644
--- a/index.php
+++ b/index.php
@@ -30,8 +30,8 @@ $GLOBALS['config']['thumbSize'] = array(
);
// Remove image older than 12 hours
$GLOBALS['config']['expireCache'] = 12;
-// Disable exec command for launch script and use cron task
-$GLOBALS['config']['disableExec'] = false;
+// Disable exec command and use cron task
+$GLOBALS['config']['disableExec'] = true;
// Enable log for success, suspect, error
$GLOBALS['config']['log'] = false;
@@ -145,17 +145,30 @@ function launchScript($url, $hashUrl, $width, $size, $onlyThumb, $waitForResult
}
if ($GLOBALS['config']['disableExec'] === false) {
+ chdir('bin/');
if ($waitForResult === false) {
- exec('bin/thumb_server.sh '.$url.' '.$hashUrl.' '.$width.' '.$size.' '.$onlyThumb.' > /dev/null &', $result);
+ exec('bash thumb_server.sh '.$url.' '.$hashUrl.' '.$width.' '.$size.' '.$onlyThumb.' > /dev/null &', $result);
} else {
- exec('bin/thumb_server.sh '.$url.' '.$hashUrl.' '.$width.' '.$size.' '.$onlyThumb.' 1', $result);
+ exec('bash thumb_server.sh '.$url.' '.$hashUrl.' '.$width.' '.$size.' '.$onlyThumb.' 1', $result);
}
+ chdir('../');
} else {
- return 0;
+ makeQueueFile($url, $hashUrl, $width, $size, $onlyThumb);
+ $result = 0;
}
return $result;
}
+function makeQueueFile($url, $hashUrl, $width, $size, $onlyThumb) {
+ $url = str_replace('\'', '', $url);
+ $hashUrl = str_replace('\'', '', $hashUrl);
+ $width = str_replace('\'', '', $width);
+ if (!file_exists('cache/cronTask/'.$hashUrl.'.hash')) {
+ $data = $url.' '.$hashUrl.' '.$width.' '.$size.' '.$onlyThumb. "\n";
+ file_put_contents('cache/cronTask/'.$hashUrl.'.hash', $data);
+ }
+}
+
function testValidUrl($url) {
$url = trim($url);
if (filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED)) {
@@ -168,7 +181,7 @@ function testValidUrl($url) {
}
return true;
} else {
- return array('msg' => 'Url are not valid.');
+ return array('msg' => 'Not a valid url.');
}
}
@@ -244,6 +257,9 @@ function install() {
if (!is_dir('cache/tmp') && !mkdir('cache/tmp', 0705)) {
die('Error on create dir "cache/tmp".');
}
+ if (!is_dir('cache/cronTask') && !mkdir('cache/cronTask', 0705)) {
+ die('Error on create dir "cache/cronTask".');
+ }
$salt = sha1(uniqid(rand(), true).'_'.mt_rand());
$serverKey = substr(sha1(uniqid(rand(), true).'_'.mt_rand().$salt), 0, 12);
$encryptServerKey = sha1($serverKey.$salt);
@@ -279,6 +295,9 @@ function checkInstall() {
if (!is_file('cache/config/.htaccess')) {
file_put_contents('cache/config/.htaccess', "Allow from none\nDeny from all\n");
}
+ if (!is_file('cache/cronTask/.htaccess')) {
+ file_put_contents('cache/config/.htaccess', "Allow from none\nDeny from all\n");
+ }
if (!is_file('bin/.htaccess')) {
file_put_contents('bin/.htaccess', "Allow from none\nDeny from all\n");
}
@@ -367,9 +386,9 @@ function n_print($data, $name = '') {
echo '
', $name, '
';
echo '
@@ -552,7 +571,7 @@ if (!empty($ui['request']) && $ui['p'] !== 'install' && $ui['p'] !== 'login' &&
}
if ((isset($ui['iw']) && (int)$ui['iw'] === 1 && $ui['request'] === 'api')) {
$res = launchScript($defUrl, $hashUrl, $width, $ui['s'], $GLOBALS['config']['onlyThumb'], true);
- } elseif ((isset($ui['iw']) && (int)$ui['iw'] === 1 && $ui['request'] === 'form')) {
+ } elseif (isset($ui['iw']) && (int)$ui['iw'] === 1 && $ui['request'] === 'form') {
$res = launchScript($defUrl, $hashUrl, $width, 'shortLive', $GLOBALS['config']['onlyThumb'], true);
} else {
$res = launchScript($defUrl, $hashUrl, $width, $ui['s'], $GLOBALS['config']['onlyThumb'], false);
@@ -561,6 +580,9 @@ if (!empty($ui['request']) && $ui['p'] !== 'install' && $ui['p'] !== 'login' &&
$file = 'bin/loadingGen';
printThumbShot($file);
} else {
+ if ($GLOBALS['config']['disableExec'] === true) {
+ $file = 'bin/loadingGen';
+ }
$success = array(
'normal' => $file.'.png',
'thumb' => $file.'_thumb.png'
@@ -576,11 +598,11 @@ if (!empty($ui['request']) && $ui['p'] !== 'install' && $ui['p'] !== 'login' &&
SoShot
-
+
+