From: Alan Knowles <alan@roojs.com>
Date: Fri, 12 Oct 2018 02:55:19 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=aef2fedc2f293b10cca06d5579fe62c0c5b1186f

sync
---

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index db086ddf..0bca6db7 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -536,7 +536,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             return false;
         }
         
-        $cmd = "{$oathtool} --totp --base32 {$this->oath_key}";
+        $cmd = "{$oathtool} --totp --base32 " . escapeshellarg($this->oath_key);
         
         $password = exec($cmd);
         
@@ -675,12 +675,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         $s = DB_DataObject::Factory('core_setting');
         $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
-        
-        if(!empty($oath_require)) {
-            if($oath_require->val == 0) {
-                $aur['require_oath'] = 0;
-            }
-        } 
+        $aur['require_oath'] = $oath_require ?  $oath_require->val : 0;
         
         return $aur;
     }
diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 1a69da3a..05816c4e 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -89,11 +89,9 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         
         $c = $this->lookup($a['module'], $a['name']);
         
-        $o = empty($c) ? false : clone($c);
+        $o = $c ? clone($c) : false;
         
-        if(empty($c)) {
-            $c = DB_DataObject::factory('core_setting');
-        }
+        $c = $c ? $c : DB_DataObject::factory('core_setting');
         
         $c->setFrom(array(
             'module'        =>     $a['module'],
@@ -105,7 +103,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             'is_valid' => 1
         ));
         
-        empty($o) ? $c->insert() : $c->update($o);
+        $o ?  $c->update($o) : $c->insert();
     }
     
     //one key for encrypting all the settings