Update

Blair2004 · Jul 6, 2016 · 8413982 · 8413982
1 parent e83fbd1
commit 8413982
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/about.md b/about.md
@@ -2,6 +2,9 @@
 This is a brand new release of Tendoo CMS, with auto update feature.
 
 ### What's new ?
+- Oauth Feature Phase 1
+- Migration fixed
+- Merging CodeIgniter RestFul
 
 ### Bug Fix
 

diff --git a/application/config/config.php b/application/config/config.php
@@ -414,7 +414,7 @@
 |          for backwards compatibility purposes!
 |
 */
-$config['global_xss_filtering'] = true;
+$config['global_xss_filtering'] = false;
 
 /*
 |--------------------------------------------------------------------------

diff --git a/application/config/tendoo.php b/application/config/tendoo.php
@@ -19,15 +19,15 @@
 $config[ 'default_logout_route' ]                    =    '/dashboard/';
 
 // Core ID	
-$config[ 'version' ]                                =    $config[ 'core_version' ]    =    '3.1.1'; // core id
+$config[ 'version' ]                                =    $config[ 'core_version' ]    =    '3.1.2'; // core id
 $config[ 'core_signature' ]                            =    'Tendoo ' . $config[ 'version' ]; // core id
 $config[ 'supported_languages' ]                    =    array(
     'en_US' => 'English',
     'fr_FR'    => 'Français'
     // 'es_ES'	=>	'Español' // Coming Soon
 );
 $config[ 'site_language' ]                            =    'en_US'; // @since 4.0.5
-$config[ 'database_version' ]                        =    '1.0';
+$config[ 'database_version' ]                        =    '1.1';
 
 // Text Domain @since 3.0.5
 $config[ 'text_domain' ]                            =    array(

diff --git a/application/libraries/Menu.php b/application/libraries/Menu.php
@@ -34,7 +34,7 @@ public static function load()
             $class            =    is_array($current_menu) && count($current_menu) > 1 ? 'treeview' : '';
             $loop_index        =    0;
             ?>
-            <li class="<?php echo $class . ' ' . $menu_status;
+            <li class="<?php echo $class . ' ' . $menu_status . ' namespace-' . $menu_namespace ;
             ?>">
             <?php
             foreach ($current_menu as $menu) {

diff --git a/application/libraries/OauthLibrary.php b/application/libraries/OauthLibrary.php
@@ -108,4 +108,19 @@ public function checkScope($endpoint_scope)
         }
         return true;
     }
+
+	/**
+	 * Get User Auth id
+	 * get user who generated api ID
+	**/
+
+	public function getKeyOwnerId()
+	{
+		$query    =    get_instance()->db
+        ->where('key', @$_SERVER[ 'HTTP_' . get_instance()->config->item('rest_header_key') ])
+        ->get('restapi_keys')
+        ->result();
+
+		return $query[0]->user;
+	}
 }