Merge
This commit is contained in:
kaetemi
parent
f037b88d28
commit
c7054fadb7
15 changed files with 43 additions and 24 deletions
|
|
@ -201,6 +201,7 @@ class DBLayer {
|
|||
$field_option_values = ltrim($field_option_values, ',');
|
||||
try {
|
||||
$sth = $this->PDO->prepare("UPDATE $tb_name SET $field_option_values WHERE $where ");
|
||||
error_log("UPDATE $tb_name SET $field_option_values WHERE $where ");
|
||||
|
||||
foreach ($data as $key => $value) {
|
||||
$sth->bindValue(":$key", $value);
|
||||
|
|
|
|||
|
|
@ -22,19 +22,20 @@ class Helpers {
|
|||
global $SITEBASE;
|
||||
global $AMS_TRANS;
|
||||
global $INGAME_LAYOUT;
|
||||
global $AMS_CACHEDIR;
|
||||
// define('SMARTY_SPL_AUTOLOAD',1);
|
||||
require_once $AMS_LIB . '/smarty/libs/Smarty.class.php';
|
||||
spl_autoload_register( '__autoload' );
|
||||
|
||||
$smarty = new Smarty;
|
||||
$smarty -> setCompileDir( $SITEBASE . '/templates_c/' );
|
||||
$smarty -> setCacheDir( $SITEBASE . '/cache/' );
|
||||
$smarty -> setCacheDir( $AMS_CACHEDIR );
|
||||
$smarty -> setConfigDir( $SITEBASE . '/configs/' );
|
||||
// turn smarty debugging on/off
|
||||
$smarty -> debugging = false;
|
||||
// caching must be disabled for multi-language support
|
||||
$smarty -> caching = false;
|
||||
$smarty -> cache_lifetime = 5;
|
||||
$smarty -> cache_lifetime = 300;
|
||||
|
||||
if (function_exists('apc_cache_info')) {
|
||||
// production
|
||||
|
|
|
|||
|
|
@ -18,14 +18,15 @@ class Sync{
|
|||
if (function_exists('pcntl_fork')) {
|
||||
$pid = pcntl_fork();
|
||||
}
|
||||
$pidfile = '/tmp/ams_cron_pid';
|
||||
global $AMS_TMPDIR;
|
||||
$pidfile = $AMS_TMPDIR.'/ams_cron_pid';
|
||||
|
||||
if(isset($pid)) {
|
||||
if(isset($pid) and function_exists('pcntl_fork') ) {
|
||||
// We're the main process.
|
||||
} else {
|
||||
if(!file_exists($pidfile)) {
|
||||
$pid = getmypid();
|
||||
$file = fopen($pidfile, 'w');
|
||||
$file = fopen($pidfile, 'w+');
|
||||
|
||||
fwrite($file, $pid);
|
||||
fclose($file);
|
||||
|
|
@ -57,13 +58,13 @@ class Sync{
|
|||
$decode = json_decode($record['query']);
|
||||
$values = array('Password' => $decode[1]);
|
||||
//make connection with and put into shard db & delete from the lib
|
||||
$db->update("user", $values, "Login = $decode[0]");
|
||||
$db->update("user", $values, "Login = '$decode[0]'");
|
||||
break;
|
||||
case 'change_mail':
|
||||
$decode = json_decode($record['query']);
|
||||
$values = array('Email' => $decode[1]);
|
||||
//make connection with and put into shard db & delete from the lib
|
||||
$db->update("user", $values, "Login = $decode[0]");
|
||||
$db->update("user", $values, "Login = '$decode[0]'");
|
||||
break;
|
||||
case 'createUser':
|
||||
$decode = json_decode($record['query']);
|
||||
|
|
|
|||
|
|
@ -216,6 +216,18 @@ class Ticket{
|
|||
foreach ($fetchall as &$value) {
|
||||
$webUser = new WebUsers($value['Uploader']);
|
||||
$fetchall[$base]['Username'] = $webUser->getUsername();
|
||||
|
||||
$bytes = $fetchall[$base]['Filesize'];
|
||||
$precision = 2;
|
||||
$units = array('B', 'KB', 'MB', 'GB', 'TB');
|
||||
|
||||
$bytes = max($bytes, 0);
|
||||
$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
|
||||
$pow = min($pow, count($units) - 1);
|
||||
|
||||
$bytes /= pow(1024, $pow);
|
||||
|
||||
$fetchall[$base]['Filesize'] = round($bytes, $precision) . ' ' . $units[$pow];;
|
||||
$base++;
|
||||
}
|
||||
return $fetchall;
|
||||
|
|
|
|||
|
|
@ -436,7 +436,7 @@ class Users{
|
|||
try {
|
||||
//make connection with and put into shard db
|
||||
$dbs = new DBLayer("shard");
|
||||
$dbs->update("user", $values, "Login = $user");
|
||||
$dbs->update("user", $values, "Login = '$user'");
|
||||
return "ok";
|
||||
}
|
||||
catch (PDOException $e) {
|
||||
|
|
|
|||
0
code/web/private_php/ams/tmp/placeholder
Normal file
0
code/web/private_php/ams/tmp/placeholder
Normal file
|
|
@ -1,2 +0,0 @@
|
|||
RewriteEngine On
|
||||
RewriteRule ^$ /ams [R=301,L]
|
||||
|
|
@ -234,11 +234,11 @@ class WebUsers extends Users{
|
|||
|
||||
$hashpass = crypt($pass, WebUsers::generateSALT());
|
||||
$reply = WebUsers::setAmsPassword($user, $hashpass);
|
||||
$values = Array('pass' => $hashpass);
|
||||
$values = Array('Password' => $hashpass);
|
||||
try {
|
||||
//make connection with and put into shard db
|
||||
$dbw = new DBLayer("web");
|
||||
$dbw->update("ams_user", $values,"Login = $user");
|
||||
$dbw->update("ams_user", $values,"Login = '$user'");
|
||||
}
|
||||
catch (PDOException $e) {
|
||||
//ERROR: the web DB is offline
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
* @author Daan Janssens, mentored by Matthew Lagoe
|
||||
*/
|
||||
|
||||
require( '../libinclude.php' );
|
||||
require( '../../www/config.php' );
|
||||
require( '../../config.php' );
|
||||
require_once( $AMS_LIB . '/libinclude.php' );;
|
||||
|
||||
$mail_handler = new Mail_Handler();
|
||||
$mail_handler->cron();
|
||||
|
|
@ -4,8 +4,6 @@
|
|||
* This small piece of php code calls the syncdata() function of Sync class.
|
||||
* @author Daan Janssens, mentored by Matthew Lagoe
|
||||
*/
|
||||
|
||||
require( '../libinclude.php' );
|
||||
require( '../../www/config.php' );
|
||||
|
||||
require( '../../config.php' );
|
||||
require_once( $AMS_LIB . '/libinclude.php' );
|
||||
Sync::syncdata();
|
||||
0
code/web/public_php/ams/files/index.html
Normal file
0
code/web/public_php/ams/files/index.html
Normal file
|
|
@ -28,7 +28,13 @@ session_start();
|
|||
|
||||
$fileParts = pathinfo($_FILES['Filedata']['name']);
|
||||
Ticket::add_Attachment($_GET['id'],$_FILES['Filedata']['name'],$_SESSION['id'],$tempFile);
|
||||
echo "Uploaded :".$_FILES['Filedata']['name'];
|
||||
} else {
|
||||
echo "Upload Failed!";
|
||||
}
|
||||
echo "Upload Failed!";
|
||||
}
|
||||
echo "Upload Failed!";
|
||||
}
|
||||
echo "Upload Failed!";
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ if ( isset( $_GET["cron"] ) ) {
|
|||
}
|
||||
|
||||
// Always try to sync on page load, ie "lazy" cron
|
||||
Sync :: syncdata( false );
|
||||
Sync :: syncdata( true );
|
||||
|
||||
// Decide what page to load
|
||||
if ( ! isset( $_GET["page"] ) ) {
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
<tr>
|
||||
<td><a href="{$FILE_WEB_PATH}{$array['Path']}">{$array['Filename']}</a></td>
|
||||
<td>{$array['Timestamp']}</td>
|
||||
<td>{$array['Filesize']} Bytes</td>
|
||||
<td>{$array['Filesize']}</td>
|
||||
<td>{if $permission > 1}
|
||||
<a href="{$BASE_WEBPATH}index.php?page=show_user&id={$array['Uploader']}">{$array['Username']}</a>
|
||||
{else}
|
||||
|
|
@ -136,17 +136,19 @@
|
|||
$(document).ready( function () {
|
||||
|
||||
$('#file_upload').uploadify({
|
||||
'formData' : {'PHPSESSID': '{/literal}{$sessionid}{literal}'},
|
||||
'formData' : {'PHPSESSID': '{/literal}{nocache}{$sessionid}{/nocache}{literal}'},
|
||||
'auto' : true,
|
||||
'multi' : true,
|
||||
'method' : 'post',
|
||||
'swf': 'misc/uploadify.swf',
|
||||
'uploader': 'func/upload.php?id='+{/literal}{$ticket_id}{literal}
|
||||
'displayData': 'percentage',
|
||||
'uploader': 'func/upload.php?id='+{/literal}{$ticket_id}{literal},
|
||||
'removeCompleted' : false
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
{/literal}
|
||||
<div id="filesUploaded"></div>
|
||||
<div class="control-group">
|
||||
<label class="control-label"></label>
|
||||
<div class="controls">
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<script>
|
||||
function sync(){
|
||||
xmlhttp=new XMLHttpRequest();
|
||||
xmlhttp.open("POST","../../../ams_lib/cron/sync_cron.php",true);
|
||||
xmlhttp.open("POST","cron/sync_cron.php",true);
|
||||
xmlhttp.send();
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in a new issue