@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | $percent; |
23 | 23 | foreach (getGitLog() as $i) { |
24 | 24 | $cont++; |
25 | - if($cont % $nPerCol == 1) |
|
26 | - echo '<div class="row">'; |
|
25 | + if($cont % $nPerCol == 1) { |
|
26 | + echo '<div class="row">'; |
|
27 | + } |
|
27 | 28 | if(isset($i["tag"])) { |
28 | 29 | $percent = explode(".",$i["tag"]); |
29 | 30 | $percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]); |
@@ -32,7 +33,8 @@ discard block |
||
32 | 33 | <div class="col-lg-<?=$dim?>"> |
33 | 34 | <div class="well well-sm miniblock"> |
34 | 35 | <div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div> |
35 | - <div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) echo $i["tag"]?><br></div> |
|
36 | + <div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) { |
|
37 | + echo $i["tag"]?><br></div> |
|
36 | 38 | <div class="date"><b>Date:</b> <?=$i["date"]?><br></div> |
37 | 39 | <div class="message"><b>Message:</b> <?=$i["message"]?><br></div> |
38 | 40 | <div class="progress"> |
@@ -46,6 +48,7 @@ discard block |
||
46 | 48 | <?php |
47 | 49 | if($cont % $nPerCol == 0) |
48 | 50 | echo '</div>'; |
51 | +} |
|
49 | 52 | } ?> |
50 | 53 | </div> |
51 | 54 | </div> |
@@ -23,33 +23,39 @@ discard block |
||
23 | 23 | } |
24 | 24 | public function getJsVariables() { |
25 | 25 | $temp = []; |
26 | - foreach ($this->required as $i) |
|
27 | - if (is_array($i)) |
|
26 | + foreach ($this->required as $i) { |
|
27 | + if (is_array($i)) |
|
28 | 28 | array_push($temp,$i); |
29 | - foreach ($this->modules as $i) |
|
30 | - $temp = array_merge( $temp, $i->getJsVariables() ); |
|
31 | - foreach ($this->files as $i) |
|
32 | - if (is_array($i)) |
|
29 | + } |
|
30 | + foreach ($this->modules as $i) { |
|
31 | + $temp = array_merge( $temp, $i->getJsVariables() ); |
|
32 | + } |
|
33 | + foreach ($this->files as $i) { |
|
34 | + if (is_array($i)) |
|
33 | 35 | array_push($temp,$i); |
36 | + } |
|
34 | 37 | return $temp; |
35 | 38 | } |
36 | 39 | public function addModules( $_mods ) { |
37 | - foreach ($_mods as $value) |
|
38 | - $this->addModule($value); |
|
40 | + foreach ($_mods as $value) { |
|
41 | + $this->addModule($value); |
|
42 | + } |
|
39 | 43 | } |
40 | 44 | public function addModule( $_mod ) { |
41 | 45 | $this->modules[$_mod->name] = $_mod; |
42 | 46 | } |
43 | 47 | public function addFiles( $_files ) { |
44 | - foreach ($_files as $value) |
|
45 | - $this->addFile($value); |
|
48 | + foreach ($_files as $value) { |
|
49 | + $this->addFile($value); |
|
50 | + } |
|
46 | 51 | } |
47 | 52 | public function addFile( $_file ) { |
48 | 53 | array_push($this->files, $_file); |
49 | 54 | } |
50 | 55 | public function addFilesRequired( $_files ) { |
51 | - foreach ($_files as $value) |
|
52 | - $this->addFileRequired($value); |
|
56 | + foreach ($_files as $value) { |
|
57 | + $this->addFileRequired($value); |
|
58 | + } |
|
53 | 59 | } |
54 | 60 | public function addFileRequired( $_file ) { |
55 | 61 | array_push($this->required, $_file); |
@@ -61,14 +67,17 @@ discard block |
||
61 | 67 | } |
62 | 68 | protected function getRequire( $_function, $_extenction) { |
63 | 69 | $temp = []; |
64 | - foreach ($this->required as $i) |
|
65 | - if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
70 | + foreach ($this->required as $i) { |
|
71 | + if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
66 | 72 | array_push($temp,$i); |
67 | - foreach ($this->modules as $i) |
|
68 | - $temp = array_merge( $temp, $i->$_function() ); |
|
69 | - foreach ($this->files as $i) |
|
70 | - if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
73 | + } |
|
74 | + foreach ($this->modules as $i) { |
|
75 | + $temp = array_merge( $temp, $i->$_function() ); |
|
76 | + } |
|
77 | + foreach ($this->files as $i) { |
|
78 | + if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
71 | 79 | array_push($temp,$i); |
80 | + } |
|
72 | 81 | return $temp; |
73 | 82 | } |
74 | 83 | } |
@@ -11,9 +11,10 @@ |
||
11 | 11 | $this->connection["$_name"] = $_connection; |
12 | 12 | $this->currentConnection = $_connection; |
13 | 13 | |
14 | - foreach ($this->modules as &$module) |
|
15 | - if(isset($module->currentConnection)) |
|
14 | + foreach ($this->modules as &$module) { |
|
15 | + if(isset($module->currentConnection)) |
|
16 | 16 | $module->addConnection($_name, $_connection); |
17 | + } |
|
17 | 18 | } |
18 | 19 | public function setConnection( $_name ) { |
19 | 20 | $this->currentConnection = $this->connection["$_name"]; |
@@ -17,10 +17,11 @@ discard block |
||
17 | 17 | public function import( $_path, $_type = "misc" ) { |
18 | 18 | $data = file_get_contents($_path); |
19 | 19 | $data = json_decode($data); |
20 | - if( $_type == "connection" ) |
|
21 | - $this->overlayConnection($data); |
|
22 | - else |
|
23 | - $this->overlayMisc($data); |
|
20 | + if( $_type == "connection" ) { |
|
21 | + $this->overlayConnection($data); |
|
22 | + } else { |
|
23 | + $this->overlayMisc($data); |
|
24 | + } |
|
24 | 25 | } |
25 | 26 | protected function overlayConnection( $_data ) { |
26 | 27 | $this->connection = $this->obj2array($_data); |
@@ -40,8 +41,9 @@ discard block |
||
40 | 41 | return $return; |
41 | 42 | } |
42 | 43 | protected function importObject( $_object ) { |
43 | - foreach (get_object_vars($_object) as $key => $value) |
|
44 | - $this->$key = $value; |
|
44 | + foreach (get_object_vars($_object) as $key => $value) { |
|
45 | + $this->$key = $value; |
|
46 | + } |
|
45 | 47 | } |
46 | 48 | } |
47 | 49 | ?> |
@@ -1,7 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | function getGitLog( $_dir = "./" ) { |
3 | - if(!file_exists($_dir)) |
|
4 | - return []; |
|
3 | + if(!file_exists($_dir)) { |
|
4 | + return []; |
|
5 | + } |
|
5 | 6 | $currentDir = getcwd(); |
6 | 7 | chdir($_dir); |
7 | 8 | $gitHistory = []; |
@@ -35,19 +36,17 @@ discard block |
||
35 | 36 | $tag = trim($tag[0]); |
36 | 37 | $gitHistory[$lastHash]['tag'] = $tag; |
37 | 38 | } |
38 | - } |
|
39 | - else if (strpos($line, 'Author') === 0) { |
|
39 | + } else if (strpos($line, 'Author') === 0) { |
|
40 | 40 | $author = explode(':', $line); |
41 | 41 | $author = trim(end($author)); |
42 | 42 | $gitHistory[$lastHash]['author'] = $author; |
43 | - } |
|
44 | - else if (strpos($line, 'Date') === 0) { |
|
43 | + } else if (strpos($line, 'Date') === 0) { |
|
45 | 44 | $date = explode(':', $line, 2); |
46 | 45 | $date = trim(end($date)); |
47 | 46 | $gitHistory[$lastHash]['date'] = date('d/m/Y H:i:s A', strtotime($date)); |
47 | + } else { |
|
48 | + $gitHistory[$lastHash]['message'] .= "$line<br>"; |
|
48 | 49 | } |
49 | - else |
|
50 | - $gitHistory[$lastHash]['message'] .= "$line<br>"; |
|
51 | 50 | } |
52 | 51 | } |
53 | 52 | chdir($currentDir); |
@@ -13,9 +13,10 @@ discard block |
||
13 | 13 | $pk_menu = $i["pk_menu"]; |
14 | 14 | array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [])); |
15 | 15 | $submenu = $this->queryFetch("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`"); |
16 | - if($submenu) |
|
17 | - foreach ($submenu as $j) |
|
16 | + if($submenu) { |
|
17 | + foreach ($submenu as $j) |
|
18 | 18 | array_push( $temp[count($temp)-1]["submenu"], array("label" => $j["label"], "link" => $j["link"], []) ); |
19 | + } |
|
19 | 20 | } |
20 | 21 | } |
21 | 22 | $this->tags["menu"] = $temp; |
@@ -26,9 +27,9 @@ discard block |
||
26 | 27 | $actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; |
27 | 28 | foreach ($this->tags["menu"] as $i) { |
28 | 29 | $active = $this->isSubString($actual_link,array_merge(array_column($i["submenu"], 'link'), array($i["link"])))? "active" : ""; |
29 | - if( is_array($i["submenu"]) && count($i["submenu"])<1) |
|
30 | - $temp .= "<li class='$active'><a href='$i[link]'>$i[label]</a></li>"; |
|
31 | - else { |
|
30 | + if( is_array($i["submenu"]) && count($i["submenu"])<1) { |
|
31 | + $temp .= "<li class='$active'><a href='$i[link]'>$i[label]</a></li>"; |
|
32 | + } else { |
|
32 | 33 | $temp .= "<li class='dropdown $active'>"; |
33 | 34 | $temp .= |
34 | 35 | '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'. |
@@ -36,8 +37,9 @@ discard block |
||
36 | 37 | '<span class="caret"></span>'. |
37 | 38 | '</a>'. |
38 | 39 | '<ul class="dropdown-menu">'; |
39 | - foreach ($i["submenu"] as $j) |
|
40 | - $temp .= "<li><a href='$j[link]'>$j[label]</a></li>"; |
|
40 | + foreach ($i["submenu"] as $j) { |
|
41 | + $temp .= "<li><a href='$j[link]'>$j[label]</a></li>"; |
|
42 | + } |
|
41 | 43 | $temp .= "</ul></li>"; |
42 | 44 | } |
43 | 45 | } |
@@ -45,17 +47,19 @@ discard block |
||
45 | 47 | } |
46 | 48 | protected function isSubString( $_string, $_list) { |
47 | 49 | $success = false; |
48 | - foreach ($_list as $i) |
|
49 | - if(strpos($_string,$i) !== false) |
|
50 | + foreach ($_list as $i) { |
|
51 | + if(strpos($_string,$i) !== false) |
|
50 | 52 | $success = true; |
53 | + } |
|
51 | 54 | return $success; |
52 | 55 | } |
53 | 56 | public function loginWithUser() { |
54 | 57 | $this->init(); |
55 | 58 | $temp = []; |
56 | 59 | $user = ""; |
57 | - if(!isset($_SESSION["username"])) |
|
58 | - $_SESSION["username"] ="guest"; |
|
60 | + if(!isset($_SESSION["username"])) { |
|
61 | + $_SESSION["username"] ="guest"; |
|
62 | + } |
|
59 | 63 | $user = $_SESSION["username"]; |
60 | 64 | $blackList = $this->queryFetch( |
61 | 65 | "SELECT user.*,user_section.* |
@@ -69,11 +73,13 @@ discard block |
||
69 | 73 | foreach ($this->tags["menu"] as $i) { |
70 | 74 | $success = true; |
71 | 75 | $k = $i["label"]; |
72 | - foreach ($blackList as $j) |
|
73 | - if( $j["section"] == $k) |
|
76 | + foreach ($blackList as $j) { |
|
77 | + if( $j["section"] == $k) |
|
74 | 78 | $success = false; |
75 | - if($success) |
|
76 | - array_push($temp,$i); |
|
79 | + } |
|
80 | + if($success) { |
|
81 | + array_push($temp,$i); |
|
82 | + } |
|
77 | 83 | } |
78 | 84 | $this->tags["menu"] = $temp; |
79 | 85 | } |
@@ -12,9 +12,10 @@ |
||
12 | 12 | echo minifyOutput($render); |
13 | 13 | } |
14 | 14 | protected function overlayTag( $_page ) { |
15 | - foreach($this->tags as $key => $value) |
|
16 | - if(!is_array($value)) |
|
15 | + foreach($this->tags as $key => $value) { |
|
16 | + if(!is_array($value)) |
|
17 | 17 | $_page = str_replace("<_${key}_>", "$value", $_page); |
18 | + } |
|
18 | 19 | return $_page; |
19 | 20 | } |
20 | 21 | } |
@@ -26,17 +26,20 @@ |
||
26 | 26 | $this->tags["js"] = array_unique($this->tags["js"]); |
27 | 27 | $this->tags["pagePath"] = json_encode($this->tags["pagePath"]); |
28 | 28 | $tempStr = ""; |
29 | - foreach ($this->tags["css"] as $i) |
|
30 | - $tempStr .= "<link rel='stylesheet' href='$i'>"; |
|
29 | + foreach ($this->tags["css"] as $i) { |
|
30 | + $tempStr .= "<link rel='stylesheet' href='$i'>"; |
|
31 | + } |
|
31 | 32 | $this->tags["css"] = $tempStr; |
32 | 33 | $tempStr = ""; |
33 | - foreach ($this->tags["js"] as $i) |
|
34 | - $tempStr .= "<script src='$i'></script>"; |
|
34 | + foreach ($this->tags["js"] as $i) { |
|
35 | + $tempStr .= "<script src='$i'></script>"; |
|
36 | + } |
|
35 | 37 | $this->tags["js"] = $tempStr; |
36 | 38 | $tempStr = ""; |
37 | 39 | $tempStr .= "<script type='text/javascript'>"; |
38 | - foreach ($this->tags["jsVariables"] as $i) |
|
39 | - $tempStr .= " $i[0] = $i[1];\n"; |
|
40 | + foreach ($this->tags["jsVariables"] as $i) { |
|
41 | + $tempStr .= " $i[0] = $i[1];\n"; |
|
42 | + } |
|
40 | 43 | $tempStr .= "</script>"; |
41 | 44 | $this->tags["jsVariables"] = $tempStr; |
42 | 45 | } |
@@ -36,10 +36,12 @@ |
||
36 | 36 | function arrayDump( $_array, $_name = "Array", $_tab = " " ) { |
37 | 37 | $position = preg_replace('/ /', '', $_tab, 1); |
38 | 38 | echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>"; |
39 | - foreach ($_array as $k => $i) |
|
40 | - if(is_array($i)) |
|
39 | + foreach ($_array as $k => $i) { |
|
40 | + if(is_array($i)) |
|
41 | 41 | arrayDump( $i, $k, " $_tab" ); |
42 | - else |
|
43 | - echo "$_tab<b>$k:</b> $i<br>"; |
|
42 | + } |
|
43 | + else { |
|
44 | + echo "$_tab<b>$k:</b> $i<br>"; |
|
45 | + } |
|
44 | 46 | } |
45 | 47 | ?> |