diff options
| -rw-r--r-- | classes/Model.php | 4 | ||||
| -rw-r--r-- | classes/User.php | 2 | ||||
| -rw-r--r-- | include/offers-view.php | 2 | ||||
| -rw-r--r-- | install/index.php | 2 | ||||
| -rw-r--r-- | install/upgrade.php | 7 |
5 files changed, 9 insertions, 8 deletions
diff --git a/classes/Model.php b/classes/Model.php index 9ad86f8..b4f258d 100644 --- a/classes/Model.php +++ b/classes/Model.php @@ -137,9 +137,10 @@ abstract class Model { public static function create($pdo, $values) { $columns = array_combine(static::$fillable_columns, $values); $questions = []; + $class = get_called_class(); foreach ($columns as $column => $value) { - $columns[$column] = self::mutator($column, $value); + $columns[$column] = $class::mutator($column, $value); $questions[] = '?'; } @@ -149,7 +150,6 @@ abstract class Model { "VALUES (" . implode(',', $questions) . ")"); $stmt->execute(array_values($columns)); - $class = get_called_class(); return new $class($pdo, $pdo->lastInsertId()); } diff --git a/classes/User.php b/classes/User.php index 525a153..d41731a 100644 --- a/classes/User.php +++ b/classes/User.php @@ -64,7 +64,7 @@ class User extends Model { protected static function mutator($key, $value) { switch ($key) { case 'password': - return self::hash($password); + return self::hash($value); break; default: return parent::mutator($key, $value); diff --git a/include/offers-view.php b/include/offers-view.php index ec7acf9..56359ae 100644 --- a/include/offers-view.php +++ b/include/offers-view.php @@ -123,7 +123,7 @@ $_offer = new Offer($_pdo, $_id); <tbody> <?php $payment = $_offer->getPayment(); - $payments = [$payment]; + $payments = is_null($payment) ? [] : [$payment]; foreach ($payments as $payment) { echo "<tr> <td class='col-min-width'>{$payment->id}</td> diff --git a/install/index.php b/install/index.php index d331f91..6844241 100644 --- a/install/index.php +++ b/install/index.php @@ -160,7 +160,7 @@ if (isset($_GET['create_folders'])) { if (isset($_GET['create_user'])) { $username = 'admin'; try { - $password = user::generateRandomPassword(); + $password = User::generateRandomPassword(); $user = User::create($_pdo, [$username, $password]); if ($user !== false) { echo "Created user '$username' ({$user->id}) with password '$password'."; diff --git a/install/upgrade.php b/install/upgrade.php index 7caf46e..0ebff57 100644 --- a/install/upgrade.php +++ b/install/upgrade.php @@ -91,16 +91,17 @@ if (isset($_GET['upgrade'])) { if (lower_version($_GET['upgrade'], '0.4.2')) { try { $_pdo->query("CREATE TABLE IF NOT EXISTS `".Constants::db_prefix."payment` ( - `id` smallint(5) unsigned NOT NULL, + `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT, `offerId` smallint(5) unsigned NOT NULL, - `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1;"); $offers = $_pdo->query("SELECT `id`,`payment_received` FROM `".Constants::db_prefix."offer` WHERE `payment_received` IS NOT NULL"); $offers = $offers->fetchAll(PDO::FETCH_ASSOC); foreach ($offers as $offer) { $stmt = $_pdo->prepare("INSERT IGNORE INTO `".Constants::db_prefix."payment` (`offerId`,`date`) VALUES (?,?)"); - $stmt->execute($offer['id'], $offer['payment_received']); + $stmt->execute([$offer['id'], $offer['payment_received']]); } $_pdo->query("ALTER TABLE `".Constants::db_prefix."offer` DROP `payment_received`;"); |