0
@@ -277,8 +277,9 @@ foreach ($lang_list as $k=>$v)
0
   $v['flag_image'] = CmsLanguage::get_flag_image($k);
0
   $v['checkbox_name'] = "lang_enabled[$k]";
0
   $enabled_html = " ";
0
-	if( !$v['enabled'] ) {
0
-	  $enabled_html = ' disabled="disabled" ';
0
+	if( !$v['enabled'] )
0
+	{
0
+		$enabled_html = ' disabled="disabled" ';
0
   }
0
   $v['default'] = '<input type="radio" name="default_language" value="'.$k.'"' . ($default_language == $k ? ' checked="checked"' : '') . $enabled_html .' />';
0
   $lang_list[$k] = $v;

0
@@ -221,7 +221,7 @@ CmsInstallOperations::create_table($db, 'permission_defns', "
0
   extra_attr C(50),
0
   name C(50),
0
   hierarchical I1 DEFAULT 0,
0
-	table C(50)
0
+	link_table C(50)
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'serialized_versions', "

0
@@ -91,7 +91,7 @@ class CmsAcl extends CmsObject
0
     if ($defn['hierarchical'])
0
     {        
0
       $query = "SELECT max(gp.has_access)
0
-						FROM {$cms_db_prefix}{$defn['table']} c, {$cms_db_prefix}{$defn['table']} c2 
0
+						FROM {$cms_db_prefix}{$defn['link_table']} c, {$cms_db_prefix}{$defn['link_table']} c2 
0
               LEFT OUTER JOIN {$cms_db_prefix}group_permissions gp ON gp.object_id = c.id 
0
               INNER JOIN {$cms_db_prefix}permission_defns pd ON pd.id = gp.permission_defn_id 
0
             WHERE (c2.lft BETWEEN c.lft AND c.rgt) 
0
@@ -127,20 +127,20 @@ class CmsAcl extends CmsObject
0
     }
0
   }
0
   
0
-	static public function get_permission_definition($module, $extra_attr, $permission)
0
+	static public function get_permission_definitions($module, $extra_attr, $permission)
0
   {
0
     return cms_db()->GetRow('SELECT * FROM ' . cms_db_prefix() . 'permission_defns WHERE module = ? AND extra_attr = ? AND name = ?', array($module, $extra_attr, $permission));
0
   }
0
   
0
-	static public function create_permission($module, $extra_attr, $name, $hierarchical = false, $table = '')
0
+	static public function create_permission_definition($module, $extra_attr, $name, $hierarchical = false, $table = '')
0
   {
0
     $result = null;
0
     
0
-		$row = cms_db()->GetOne('SELECT * FROM ' . cms_db_prefix() . 'permission_defn WHERE module = ? AND extra_attr = ? AND name = ?', array($module, $extra_attr, $name));
0
+		$row = cms_db()->GetOne('SELECT * FROM ' . cms_db_prefix() . 'permission_defns WHERE module = ? AND extra_attr = ? AND name = ?', array($module, $extra_attr, $name));
0
     
0
     if (!$row)
0
     {
0
-			$result = cms_db()->Execute('INSERT INTO ' . cms_db_prefix() . 'permission_defn (module, extra_atr, name, hierarchical, table) VALUES (?, ?, ?, ?, ?)');
0
+			$result = cms_db()->Execute('INSERT INTO ' . cms_db_prefix() . 'permission_defns (module, extra_atr, name, hierarchical, link_table) VALUES (?, ?, ?, ?, ?)');
0
     }
0
     
0
     if ($result)
0
@@ -149,9 +149,9 @@ class CmsAcl extends CmsObject
0
     return false;
0
   }
0
   
0
-	static public function delete_permission($module, $extra_attr, $name)
0
+	static public function delete_permission_definition($module, $extra_attr, $name)
0
   {
0
-		$query = "DELETE FROM " . cms_db_prefix() . "permission_defn WHERE module = ? AND extra_attr = ? AND name = ?";
0
+		$query = "DELETE FROM " . cms_db_prefix() . "permission_defns WHERE module = ? AND extra_attr = ? AND name = ?";
0
     $result = cms_db()->Execute($query, array($module, $extra_attr, $name));
0
     
0
     if ($result)