@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | { |
| 31 | 31 | require $GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php'; |
| 32 | 32 | return; |
| 33 | - } |
|
| 33 | + } |
|
| 34 | 34 | if(file_exists('/var/www/secure_settings/class.FlipsideSettings.php')) |
| 35 | 35 | { |
| 36 | 36 | require '/var/www/secure_settings/class.FlipsideSettings.php'; |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | public function getDataSetData($dataSetName) |
| 73 | 73 | { |
| 74 | 74 | if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName])) |
| 75 | - { |
|
| 75 | + { |
|
| 76 | 76 | return false; |
| 77 | 77 | } |
| 78 | 78 | return \FlipsideSettings::$dataset[$dataSetName]; |
@@ -137,16 +137,16 @@ |
||
| 137 | 137 | { |
| 138 | 138 | if($isGroup) |
| 139 | 139 | { |
| 140 | - array_push($this->tmpMembers, array('gid' => $name)); |
|
| 140 | + array_push($this->tmpMembers, array('gid' => $name)); |
|
| 141 | 141 | } |
| 142 | 142 | else |
| 143 | 143 | { |
| 144 | - array_push($this->tmpMembers, array('uid' => $name)); |
|
| 144 | + array_push($this->tmpMembers, array('uid' => $name)); |
|
| 145 | 145 | } |
| 146 | 146 | if($flush) |
| 147 | 147 | { |
| 148 | 148 | $gid = $this->getGroupName(); |
| 149 | - $memberDT = $this->auth->getDataTable('groupUserMap'); |
|
| 149 | + $memberDT = $this->auth->getDataTable('groupUserMap'); |
|
| 150 | 150 | //Get all cu rrent direct members |
| 151 | 151 | $existing = $memberDT->read(new \Flipside\Data\Filter('groupCN eq "'.$gid.'"')); |
| 152 | 152 | $exCount = count($existing); |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $data = $userDT->read($filter); |
| 81 | 81 | if(strlen($data[0]['userPassword']) === 0) |
| 82 | 82 | { |
| 83 | - $data[0]['userPassword'] = openssl_random_pseudo_bytes(10); |
|
| 83 | + $data[0]['userPassword'] = openssl_random_pseudo_bytes(10); |
|
| 84 | 84 | } |
| 85 | 85 | $hash = hash('sha512', $data[0]['uid'].';'.$data[0]['userPassword'].';'.$data[0]['mail']); |
| 86 | 86 | $update = array('resetHash' => $hash); |