GRMrGecko/ImageDatabase
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some syntax. Fixed upload to encode html and changed plugin loop index variable to $pluginIndex so it's less likely to be used by a plugin. Probably should be using foreach or whatever it is, but I am stubborn. Added to the logout a time change to invalidate the login session. Fixed issue with pus state back to filter/index whenever you click the x button or background. Fixed user creation to use the correct password hashing system.

Browse Source
This commit is contained in:
GRMrGecko 2013-07-29 14:18:48 -05:00
parent d2f7bfebaf
commit c94bdc878f
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/api.php
View File

@ -55,7 +55,7 @@ if (isset($_MGM['user']) && $_MGM['user']['level']==1 && $_MGM['path'][1]=="user
$level = (isset($_REQUEST['level']) ? trim($_REQUEST['level']) : "");
if (!empty($email) && !empty($level)) {
$salt = substr(sha1(rand()),0,12);
$epassword = $salt.hash("sha512", $salt.hash("sha512", $password));
$epassword = $salt.hashPassword($password,hex2bin($salt));
databaseQuery("INSERT INTO users (email, password, time, level) VALUES (%s,%s,%d,%s)", $email, $epassword, $_MGM['time'], $level);
}
}

2
code/index.php
View File

@ -322,7 +322,7 @@ $(document).ready(function() {
repositionImage(2);
if (urlHistory==undefined) {
if (urlHistory!=true) {
if (filter!="") {
window.history.pushState({state: currentState}, "<?=$_MGM['title']?>", "<?=$_MGM['installPath']?>?filter="+encodeURIComponent(filter));
} else {

2
code/logout.php
View File

@ -13,6 +13,8 @@
// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
// ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
//
databaseQuery("UPDATE users SET time=%d WHERE docid=%s", $_MGM['time'], $_MGM['user']['docid']);
setcookie("{$_MGM['CookiePrefix']}user_email", "", $_MGM['time'], $_MGM['CookiePath'], $_MGM['CookieDomain']);
setcookie("{$_MGM['CookiePrefix']}user_password", "", $_MGM['time'], $_MGM['CookiePath'], $_MGM['CookieDomain']);
header("location: ".generateURL());

17
code/upload.php
View File

@ -88,18 +88,18 @@ if ($_MGM['path'][1]=="complete") {
$ocr .= $line;
}
}
echo "OCR: ".$ocr."<br />\n";
echo "OCR: ".htmlspecialchars($ocr, ENT_COMPAT | ENT_HTML401, 'UTF-8', true)."<br />\n";
}
$tags = array();
$external_data = "";
$plugins = glob("./external_data_plugins/*.php");
for ($i=0; $i<count($plugins); $i++) {
require($plugins[$i]);
for ($pluginIndex=0; $pluginIndex<count($plugins); $pluginIndex++) {
require($plugins[$pluginIndex]);
}
echo "External Data: ".$external_data."<br />\n";
echo "External Data: ".htmlspecialchars($external_data, ENT_COMPAT | ENT_HTML401, 'UTF-8', true)."<br />\n";
$thumbFile = "./thumbs/".$hash.".".$extension;
$target = 150;
@ -142,16 +142,19 @@ if ($_MGM['path'][1]=="complete") {
Processing...<br />
<div id="result"></div>
<script type="text/javascript">
var files = new Array(<?
var files = new Array(
<?
$array = "";
for ($i=0; $i<count($files); $i++) {
//if (in_array(pathinfo($files[$i], PATHINFO_EXTENSION), $allowedExtensions)) {
if ($array!="")
$array .= ",";
$array .= ",\n\t\t";
$array .= "\"".str_replace("\"", "\\\"", $files[$i])."\"";
}
echo $array;
?>);
?>
);
var i=0;
function processFiles() {
if (i<files.length) {

2
code/users.php
View File

@ -72,7 +72,7 @@ require_once("header.php");
</table>
<script type="text/javascript">
function loadUsers() {
$("#users_list tbody").load("<?=generateURL("api/users/list")?>/")
$("#users_list tbody").load("<?=generateURL("api/users/list")?>/");
}
$(document).ready(function() {
$("#users_list").on("click", "tbody tr", function() {