From 6b92b85b04633b69052564ee995761819905a821 Mon Sep 17 00:00:00 2001 From: botanic Date: Fri, 5 Sep 2014 02:10:09 -0700 Subject: [PATCH] fix sync --- code/web/private_php/ams/autoload/dblayer.php | 1 + code/web/private_php/ams/autoload/sync.php | 11 ++++++----- code/web/private_php/ams/autoload/users.php | 2 +- code/web/private_php/ams/tmp/placeholder | 0 code/web/public_php/ams/autoload/webusers.php | 4 ++-- .../ams/cron/mail_cron.php | 4 ++-- .../ams/cron/sync_cron.php | 7 +++---- code/web/public_php/ams/index.php | 2 +- code/web/public_php/ams/templates/syncing.tpl | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 code/web/private_php/ams/tmp/placeholder rename code/web/{private_php => public_php}/ams/cron/mail_cron.php (64%) rename code/web/{private_php => public_php}/ams/cron/sync_cron.php (55%) diff --git a/code/web/private_php/ams/autoload/dblayer.php b/code/web/private_php/ams/autoload/dblayer.php index 1f361008b..140f6bfd1 100644 --- a/code/web/private_php/ams/autoload/dblayer.php +++ b/code/web/private_php/ams/autoload/dblayer.php @@ -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); diff --git a/code/web/private_php/ams/autoload/sync.php b/code/web/private_php/ams/autoload/sync.php index a79ef8b83..fe05e628e 100644 --- a/code/web/private_php/ams/autoload/sync.php +++ b/code/web/private_php/ams/autoload/sync.php @@ -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']); diff --git a/code/web/private_php/ams/autoload/users.php b/code/web/private_php/ams/autoload/users.php index ea8d134d1..1754a4f05 100644 --- a/code/web/private_php/ams/autoload/users.php +++ b/code/web/private_php/ams/autoload/users.php @@ -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) { diff --git a/code/web/private_php/ams/tmp/placeholder b/code/web/private_php/ams/tmp/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/code/web/public_php/ams/autoload/webusers.php b/code/web/public_php/ams/autoload/webusers.php index b674f63dd..b01ddf02d 100644 --- a/code/web/public_php/ams/autoload/webusers.php +++ b/code/web/public_php/ams/autoload/webusers.php @@ -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 diff --git a/code/web/private_php/ams/cron/mail_cron.php b/code/web/public_php/ams/cron/mail_cron.php similarity index 64% rename from code/web/private_php/ams/cron/mail_cron.php rename to code/web/public_php/ams/cron/mail_cron.php index 557a57417..608c3b2c0 100644 --- a/code/web/private_php/ams/cron/mail_cron.php +++ b/code/web/public_php/ams/cron/mail_cron.php @@ -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(); \ No newline at end of file diff --git a/code/web/private_php/ams/cron/sync_cron.php b/code/web/public_php/ams/cron/sync_cron.php similarity index 55% rename from code/web/private_php/ams/cron/sync_cron.php rename to code/web/public_php/ams/cron/sync_cron.php index b39da0818..905d1f7dc 100644 --- a/code/web/private_php/ams/cron/sync_cron.php +++ b/code/web/public_php/ams/cron/sync_cron.php @@ -4,8 +4,7 @@ * 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' ); - +error_log('test2'); +require( '../../config.php' ); +require_once( $AMS_LIB . '/libinclude.php' ); Sync::syncdata(); \ No newline at end of file diff --git a/code/web/public_php/ams/index.php b/code/web/public_php/ams/index.php index 1ab707e79..06d780f4a 100644 --- a/code/web/public_php/ams/index.php +++ b/code/web/public_php/ams/index.php @@ -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"] ) ) { diff --git a/code/web/public_php/ams/templates/syncing.tpl b/code/web/public_php/ams/templates/syncing.tpl index 5cd52187d..7ddc82a30 100644 --- a/code/web/public_php/ams/templates/syncing.tpl +++ b/code/web/public_php/ams/templates/syncing.tpl @@ -15,7 +15,7 @@