diversen opmerkingen

application/models/eloquent/Page.php

@@ -8,7 +8,7 @@
 
 use \Illuminate\Database\Eloquent\Model as Eloquent;
 
-class Page extends Eloquent {
+class Page extends BaseModel {
 
     protected $table = "pages";
 
@@ -20,7 +20,7 @@ class Page extends Eloquent {
 
     public static function getPages( $user )
     {
-        $pages = Page::whereRaw( 'id = page_id' )
+        $pages = Page::whereRaw( "id = page_id AND ((SELECT {$user->role} & pagelevel) != 0 OR pagelevel = 0)" )
             ->with( [
                 'subpages' => function ( $q ) use ( $user ) {
                     $q->whereRaw(
@@ -46,11 +46,16 @@ class Page extends Eloquent {
 
     public static function getPageAccessByRoleLevel( $roleLevel )
     {
-        self::selectRaw( "
+        $rolePages = self::selectRaw( "
+            id,
+            {$roleLevel} AS rolelevel,
             IF(id = page_id, 'MAIN', 'SUB') AS typepage,
+            pagename,
             IF((SELECT {$roleLevel} & pagelevel ) = 0, 'F', 'T') AS pageaccess" )
-            ->orderByRaw( "id, IF(id = page_id, 0, 1)" )
+            ->orderByRaw( "page_id, IF(id = page_id, 0, 1)" )
             ->get();
+
+        return $rolePages;
     }
 
 

application/models/eloquent/Role.php

@@ -46,6 +46,7 @@ class Role extends BaseModel {
     {
         $roles = self::all();
 
+        $pageroles=[];
         foreach ( $roles as $role )
         {
             $pageroles[ $role->id ]['rolelevel'] = $role->rolelevel;
@@ -54,6 +55,8 @@ class Role extends BaseModel {
             $pageroles[ $role->id ]['pagesAccess'] =
                 Page::getPageAccessByRoleLevel( $role->rolelevel );
         }
+
+        return $pageroles;
     }
 
 

application/models/eloquent/User.php

@@ -111,5 +111,12 @@ class User extends BaseModel {
         return $projectusers;
     }
 
+    public static function getSaltedPassword( $password, $salt )
+    {
+        $saltedpassword = sha1( sha1( $password ) . $salt );
+
+        return $saltedpassword;
+    }
+
 
 }