XaBerr /
JATE
@@ -12,9 +12,10 @@ discard block |
||
| 12 | 12 | $pk_menu = $i["pk_menu"]; |
| 13 | 13 | array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [], "relative" => false)); |
| 14 | 14 | $submenu = $this->queryFetch("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`"); |
| 15 | - if($submenu) |
|
| 16 | - foreach ($submenu as $j) |
|
| 15 | + if($submenu) { |
|
| 16 | + foreach ($submenu as $j) |
|
| 17 | 17 | array_push( $temp[count($temp)-1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false) ); |
| 18 | + } |
|
| 18 | 19 | } |
| 19 | 20 | } |
| 20 | 21 | $this->tags["menu"] = $temp; |
@@ -28,12 +29,13 @@ discard block |
||
| 28 | 29 | $relative = $this->parameters["app"]->server["RELATIVE"]; |
| 29 | 30 | foreach ($this->tags["menu"] as $i) { |
| 30 | 31 | $prePath = ""; |
| 31 | - if($i["relative"]) |
|
| 32 | - $prePath = $relative; |
|
| 32 | + if($i["relative"]) { |
|
| 33 | + $prePath = $relative; |
|
| 34 | + } |
|
| 33 | 35 | $active = $this->isSubString($actualLink, array_merge(array_column($i["submenu"], 'link'), array($i["link"]))) ? "active" : ""; |
| 34 | - if( is_array($i["submenu"]) && count($i["submenu"])<1) |
|
| 35 | - $temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>"; |
|
| 36 | - else { |
|
| 36 | + if( is_array($i["submenu"]) && count($i["submenu"])<1) { |
|
| 37 | + $temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>"; |
|
| 38 | + } else { |
|
| 37 | 39 | $temp .= "<li class='dropdown $active'>"; |
| 38 | 40 | $temp .= |
| 39 | 41 | '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'. |
@@ -43,8 +45,9 @@ discard block |
||
| 43 | 45 | '<ul class="dropdown-menu">'; |
| 44 | 46 | foreach ($i["submenu"] as $j) { |
| 45 | 47 | $prePath = ""; |
| 46 | - if($j["relative"]) |
|
| 47 | - $prePath = $relative; |
|
| 48 | + if($j["relative"]) { |
|
| 49 | + $prePath = $relative; |
|
| 50 | + } |
|
| 48 | 51 | $temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>"; |
| 49 | 52 | } |
| 50 | 53 | $temp .= "</ul></li>"; |
@@ -54,16 +57,18 @@ discard block |
||
| 54 | 57 | } |
| 55 | 58 | protected function isSubString( $_string, $_list) { |
| 56 | 59 | $success = false; |
| 57 | - foreach ($_list as $i) |
|
| 58 | - if(strpos($_string,$i) !== false) |
|
| 60 | + foreach ($_list as $i) { |
|
| 61 | + if(strpos($_string,$i) !== false) |
|
| 59 | 62 | $success = true; |
| 63 | + } |
|
| 60 | 64 | return $success; |
| 61 | 65 | } |
| 62 | 66 | public function loginWithUser() { |
| 63 | 67 | $this->init(); |
| 64 | 68 | $temp = []; |
| 65 | - if(!isset($_SESSION["username"])) |
|
| 66 | - $_SESSION["username"] ="guest"; |
|
| 69 | + if(!isset($_SESSION["username"])) { |
|
| 70 | + $_SESSION["username"] ="guest"; |
|
| 71 | + } |
|
| 67 | 72 | $user = $_SESSION["username"]; |
| 68 | 73 | $blackList = $this->queryFetch( |
| 69 | 74 | "SELECT user.*,user_section.* |
@@ -77,11 +82,13 @@ discard block |
||
| 77 | 82 | foreach ($this->tags["menu"] as $i) { |
| 78 | 83 | $success = true; |
| 79 | 84 | $k = $i["label"]; |
| 80 | - foreach ($blackList as $j) |
|
| 81 | - if( $j["section"] == $k) |
|
| 85 | + foreach ($blackList as $j) { |
|
| 86 | + if( $j["section"] == $k) |
|
| 82 | 87 | $success = false; |
| 83 | - if($success) |
|
| 84 | - array_push($temp,$i); |
|
| 88 | + } |
|
| 89 | + if($success) { |
|
| 90 | + array_push($temp,$i); |
|
| 91 | + } |
|
| 85 | 92 | } |
| 86 | 93 | $this->tags["menu"] = $temp; |
| 87 | 94 | } |
