@@ -19,13 +19,14 @@ |
||
| 19 | 19 | public function makeConnection() { |
| 20 | 20 | global $jConfig; |
| 21 | 21 | $connection = null; |
| 22 | - if($jConfig->connection["enable"]) |
|
| 23 | - $connection = new Connection( |
|
| 22 | + if($jConfig->connection["enable"]) { |
|
| 23 | + $connection = new Connection( |
|
| 24 | 24 | $jConfig->connection["server"] |
| 25 | 25 | , $jConfig->connection["database"] |
| 26 | 26 | , $jConfig->connection["user"] |
| 27 | 27 | , $jConfig->connection["password"] |
| 28 | 28 | ); |
| 29 | + } |
|
| 29 | 30 | $this->addConnection("base",$connection); |
| 30 | 31 | } |
| 31 | 32 | } |
@@ -19,13 +19,14 @@ |
||
| 19 | 19 | public function makeConnection() { |
| 20 | 20 | global $jConfig; |
| 21 | 21 | $connection = null; |
| 22 | - if($jConfig->connection["enable"]) |
|
| 23 | - $connection = new Connection( |
|
| 22 | + if($jConfig->connection["enable"]) { |
|
| 23 | + $connection = new Connection( |
|
| 24 | 24 | $jConfig->connection["server"] |
| 25 | 25 | , $jConfig->connection["database"] |
| 26 | 26 | , $jConfig->connection["user"] |
| 27 | 27 | , $jConfig->connection["password"] |
| 28 | 28 | ); |
| 29 | + } |
|
| 29 | 30 | $this->addConnection("base",$connection); |
| 30 | 31 | } |
| 31 | 32 | } |
@@ -21,23 +21,27 @@ discard block |
||
| 21 | 21 | } |
| 22 | 22 | public function getJsVariables() { |
| 23 | 23 | $temp = []; |
| 24 | - foreach ($this->files as $i) |
|
| 25 | - if (is_array($i)) |
|
| 24 | + foreach ($this->files as $i) { |
|
| 25 | + if (is_array($i)) |
|
| 26 | 26 | array_push($temp,$i); |
| 27 | - foreach ($this->modules as $i) |
|
| 28 | - $temp = array_merge( $temp, $i->getJsVariables() ); |
|
| 27 | + } |
|
| 28 | + foreach ($this->modules as $i) { |
|
| 29 | + $temp = array_merge( $temp, $i->getJsVariables() ); |
|
| 30 | + } |
|
| 29 | 31 | return $temp; |
| 30 | 32 | } |
| 31 | 33 | public function addModules( $_mods ) { |
| 32 | - foreach ($_mods as $value) |
|
| 33 | - $this->addModule($value); |
|
| 34 | + foreach ($_mods as $value) { |
|
| 35 | + $this->addModule($value); |
|
| 36 | + } |
|
| 34 | 37 | } |
| 35 | 38 | public function addModule( $_mod ) { |
| 36 | 39 | $this->modules[$_mod->name] = $_mod; |
| 37 | 40 | } |
| 38 | 41 | public function addFiles( $_files ) { |
| 39 | - foreach ($_files as $value) |
|
| 40 | - $this->addFile($value); |
|
| 42 | + foreach ($_files as $value) { |
|
| 43 | + $this->addFile($value); |
|
| 44 | + } |
|
| 41 | 45 | } |
| 42 | 46 | public function addFile( $_file ) { |
| 43 | 47 | array_push($this->files, $_file); |
@@ -49,11 +53,13 @@ discard block |
||
| 49 | 53 | } |
| 50 | 54 | protected function getRequire( $_function, $_extenction) { |
| 51 | 55 | $temp = []; |
| 52 | - foreach ($this->files as $i) |
|
| 53 | - if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
| 56 | + foreach ($this->files as $i) { |
|
| 57 | + if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
| 54 | 58 | array_push($temp,$i); |
| 55 | - foreach ($this->modules as $i) |
|
| 56 | - $temp = array_merge( $temp, $i->$_function() ); |
|
| 59 | + } |
|
| 60 | + foreach ($this->modules as $i) { |
|
| 61 | + $temp = array_merge( $temp, $i->$_function() ); |
|
| 62 | + } |
|
| 57 | 63 | return $temp; |
| 58 | 64 | } |
| 59 | 65 | } |