@@ -52,6 +52,9 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | const PRODUCTNAME = "Managed IdP"; |
| 54 | 54 | |
| 55 | + /** |
|
| 56 | + * @param integer $length |
|
| 57 | + */ |
|
| 55 | 58 | public static function random_str( |
| 56 | 59 | $length, $keyspace = '23456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' |
| 57 | 60 | ) { |
@@ -1,7 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | use web\lib\admin\storage\SessionStorage; |
| 3 | 3 | |
| 4 | -if ( !isset( $_SESSION ) ) $_SESSION = array(); |
|
| 4 | +if ( !isset( $_SESSION ) ) { |
|
| 5 | + $_SESSION = array(); |
|
| 6 | +} |
|
| 5 | 7 | |
| 6 | 8 | class SessionStorageTest extends PHPUnit_Framework_TestCase{ |
| 7 | 9 | protected $backupGlobalsBlacklist = array( '_SESSION' ); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | if(!empty($user->getIdentifier())){ |
| 14 | 14 | $this->storeInfoMessage(_('User was added successfully!')); |
| 15 | 15 | } |
| 16 | - }else{ |
|
| 16 | + } else{ |
|
| 17 | 17 | $this->storeErrorMessage(_('User name or expiry parameters are missing!')); |
| 18 | 18 | } |
| 19 | 19 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | if(count($this->row) > 0){ |
| 152 | 152 | if(isset($this->row[self::ID])){ |
| 153 | 153 | $result = $this->executeUpdateQuery(); |
| 154 | - }else{ |
|
| 154 | + } else{ |
|
| 155 | 155 | $result = $this->executeInsertQuery(); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -170,8 +170,12 @@ discard block |
||
| 170 | 170 | $types = ''; |
| 171 | 171 | $arguments = array(); |
| 172 | 172 | foreach ($this->row as $key => $attribute) { |
| 173 | - if($keyString != "(") $keyString .= " ,"; |
|
| 174 | - if($valueString != "(") $valueString .= " ,"; |
|
| 173 | + if($keyString != "(") { |
|
| 174 | + $keyString .= " ,"; |
|
| 175 | + } |
|
| 176 | + if($valueString != "(") { |
|
| 177 | + $valueString .= " ,"; |
|
| 178 | + } |
|
| 175 | 179 | $keyString .= "`" . $key . "`"; |
| 176 | 180 | $valueString .= "?"; |
| 177 | 181 | $types .= $attribute->getType(); |
@@ -200,8 +204,11 @@ discard block |
||
| 200 | 204 | $types = ''; |
| 201 | 205 | $arguments = array(); |
| 202 | 206 | foreach ($this->row as $key => $attribute) { |
| 203 | - if(!empty($updateString)) $updateString .= " ,"; |
|
| 204 | - else $updateString .=" SET "; |
|
| 207 | + if(!empty($updateString)) { |
|
| 208 | + $updateString .= " ,"; |
|
| 209 | + } else { |
|
| 210 | + $updateString .=" SET "; |
|
| 211 | + } |
|
| 205 | 212 | $updateString .= "`" . $key . "`=?"; |
| 206 | 213 | $types .= $attribute->getType(); |
| 207 | 214 | $arguments [] = $attribute->value; |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | $row = str_getcsv($this->rows[$this->index], $this->tokenDelimiter); |
| 109 | 109 | $this->index++; |
| 110 | 110 | return $row; |
| 111 | - }else{ |
|
| 111 | + } else{ |
|
| 112 | 112 | return array(); |
| 113 | 113 | } |
| 114 | 114 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $_SESSION[self::INDEX][self::SCOPED][$package] = array(); |
| 56 | 56 | } |
| 57 | 57 | $this->session = &$_SESSION[self::INDEX][self::SCOPED][$package]; |
| 58 | - }else{ |
|
| 58 | + } else{ |
|
| 59 | 59 | $this->session = &$_SESSION[self::INDEX][self::WIDE]; |
| 60 | 60 | } |
| 61 | 61 | $this->package = $package; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | self::$instance = new self($package); |
| 74 | 74 | } |
| 75 | 75 | return self::$instance; |
| 76 | - }else{ |
|
| 76 | + } else{ |
|
| 77 | 77 | if(!isset(self::$pool[$package])){ |
| 78 | 78 | self::$pool[$package] = new self($package); |
| 79 | 79 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | public function get($identifier){ |
| 113 | 113 | if(isset($this->session[$identifier])){ |
| 114 | 114 | return $this->session[$identifier]; |
| 115 | - }else{ |
|
| 115 | + } else{ |
|
| 116 | 116 | return array(); |
| 117 | 117 | } |
| 118 | 118 | } |
@@ -106,7 +106,7 @@ |
||
| 106 | 106 | |
| 107 | 107 | } |
| 108 | 108 | return $innerString; |
| 109 | - }else{ |
|
| 109 | + } else{ |
|
| 110 | 110 | return parent::composeInnerString(); |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | } |
| 66 | 66 | if(isset($this->name)){ |
| 67 | 67 | return $this->composeTagString($attributeString); |
| 68 | - }else{ |
|
| 68 | + } else{ |
|
| 69 | 69 | return ""; |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | <button type="submit" name="<?php echo $this->controls[self::YES]['name']; ?>" value="<?php echo $this->controls[self::YES]['value']; ?>"><?php echo _('Yes'); ?></button> |
| 41 | 41 | <?php if($this->controls[self::NO]['name'] == ''){ ?> |
| 42 | 42 | <button class="<?php echo $this->id . '-close'; ?>" type="reset"><?php echo _('No'); ?></button> |
| 43 | - <?php }else{ ?> |
|
| 43 | + <?php } else{ ?> |
|
| 44 | 44 | <button type="submit" name="<?php echo $this->controls[self::NO]['name']; ?>" value="<?php echo $this->controls[self::NO]['value']; ?>"><?php echo _('No'); ?></button> |
| 45 | 45 | <?php } |
| 46 | 46 | } |