Merge remote-tracking branch 'origin/master'

Author: cploutarchou

application/helpers/my_helper.php

@@ -7,61 +7,51 @@ function get_main_menu($group_id, $attr = '')
 {
     $object = new stdClass();
     $main_menu = [];
-    $parent_menu = [];
-    $parent_submenu = [];
     $ci = &get_instance();
     $ci->data = array();
     $ci->db->select('*');
     $ci->db->from('menu');
     $ci->db->where('group_id', $group_id);
     $query = $ci->db->get();
-    $menu = $query->result();
+    $menu = $query->result();;
 
     for ($i = 0; $i <= count($menu) - 1; $i++) {
         if ($menu[$i]->parent_id == 0) {
             $main_menu[] = $menu[$i];
-
         };
-
     };
+
     for ($x = 0; $x < count($main_menu, true); $x++) {
-        for ($i = 0; $i < count($menu, true); $i++) {
-            if ($menu[$i]->parent_id == $main_menu[$x]->id) {
-                $parent_menu[] = $menu[$i];
+        $parent_menu = [];
+        for ($q = 0; $q < count($menu, true); $q++) {
+            if ($menu[$q]->parent_id == $main_menu[$x]->id) {
+                $parent_menu[] = $menu[$q];
             };
         };
         $main_menu[$x]->parent_menu = $parent_menu;
     };
 
 
+//    var_dump($main_menu);
+
     for ($i = 0; $i < count($main_menu, true); $i++) {
         for ($x = 0; $x < count($main_menu[$i]->parent_menu, true); $x++) {
             for ($e = 0; $e < count($menu, true); $e++) {
                 if ($main_menu[$i]->parent_menu[$x]->id == $menu[$e]->parent_id) {
-                    $f = 0;
-                    $d = $x;
-//                    var_dump($d);
-                    if ($f !== $d) {
-//                        var_dump(true);
-                        $parent_submenu1[] = $menu[$e];
-                        $main_menu[$i]->parent_menu[$x]->parent_submenu = $parent_submenu1;
-                    } else {
-                        $parent_submenu[] = $menu[$e];
-                        $main_menu[$i]->parent_menu[$x]->parent_submenu = $parent_submenu;
-                    }
+                    $parent_submenu[] = $menu[$e];
+                    $uniqueArray = array_unique($parent_submenu, SORT_REGULAR);
+                    $main_menu[$i]->parent_menu[$x]->parent_submenu = $uniqueArray;
                 };
             };
         };
     }
-//    var_dump($main_menu[2]->parent_menu[1]);
-    $object->main_menu = $main_menu;
 
+    $object->main_menu = $main_menu;
     return $object;
 }
 
 function get_menu($group_id, $style = '')
 {
-
     $ci = &get_instance();
     $data = [
         'group_id' => $group_id,

application/views/menus/vertical-menu-default.php

@@ -19,9 +19,7 @@
                 </div>
                 <div class="collapse navbar-collapse" id="navbar-collapse-1">
                     <ul class="nav navbar-nav">
-                        <?php for ($i = 0;
-                                   $i < count($menu->main_menu, true);
-                                   $i++) { ?>
+                        <?php for ($i = 0; $i < count($menu->main_menu, true); $i++) { ?>
                             <?php if (count($menu->main_menu[$i]->parent_menu, true) == 0): ?>
                                 <li class=""><a
                                             href="<?php echo base_url() . $menu->main_menu[$i]->url ?>">
@@ -34,26 +32,25 @@ class="dropdown-toggle"
                                        data-toggle="dropdown"><?php
                                         echo $menu->main_menu[$i]->title ?> <b class="caret"></b></a>
                                     <ul class="dropdown-menu">
-                                        <?php for ($b = 0;
-                                                   $b < count($menu->main_menu[$i]->parent_menu, true);
-                                                   $b++):
-
+                                        <?php for ($b = 0; $b < count($menu->main_menu[$i]->parent_menu, true); $b++):
                                             if (!isset($menu->main_menu[$i]->parent_menu[$b]->parent_submenu)): ?>
                                                 <li><a href="#"><?php echo
                                                         $menu->main_menu[$i]->parent_menu[$b]->title ?></a></li>
-
                                             <?php else: ?>
                                                 <li class="dropdown dropdown-submenu"><a href="<?php echo base_url() .
                                                         $menu->main_menu[$i]->parent_menu[$b]->url ?>"
                                                                                          class="dropdown-toggle"
                                                                                          data-toggle="dropdown"><?php echo
                                                         $menu->main_menu[$i]->parent_menu[$b]->title ?></a>
                                                     <?php if (isset
-                                                    ($menu->main_menu[$i]->parent_menu[$b]->parent_submenu)): ?>
+                                                    ($menu->main_menu[$i]->parent_menu[$b]->parent_submenu)):
+                                      ?>
                                                         <ul class="dropdown-menu">
                                                             <?php foreach
                                                             ($menu->main_menu[$i]->parent_menu[$b]->parent_submenu
-                                                             as $par_sub) : ?>
+                                                             as $par_sub) :
+
+                                                              ?>
                                                                 <li><a href="<?php echo
                                                                     $par_sub->url ?>"><?php echo
                                                                         $par_sub->title ?>