0
@@ -1711,7 +1711,7 @@ abstract class CmsModuleBase extends CmsObject
0
       {
0
         $new_id = $db->GenID(cms_db_prefix()."permissions_seq");
0
         $time = $db->DBTimeStamp(time());
0
-				$query = "INSERT INTO ".cms_db_prefix()."permissions (permission_id, permission_name, permission_text, create_date, modified_date) VALUES (?,?,?,".$time.",".$time.")";
0
+				$query = "INSERT INTO ".cms_db_prefix()."permissions (id, permission_name, permission_text, create_date, modified_date) VALUES (?,?,?,".$time.",".$time.")";
0
         $db->Execute($query, array($new_id, $permission_name, $permission_text));
0
       }
0
     }
0
@@ -1743,17 +1743,17 @@ abstract class CmsModuleBase extends CmsObject
0
     global $gCms;
0
     $db = cms_db();
0
 
0
-		$query = "SELECT permission_id FROM ".cms_db_prefix()."permissions WHERE permission_name = ?";
0
+		$query = "SELECT id FROM ".cms_db_prefix()."permissions WHERE permission_name = ?";
0
     $row = &$db->GetRow($query, array($permission_name));
0
 
0
     if ($row)
0
     {
0
-			$id = $row["permission_id"];
0
+			$id = $row["id"];
0
 
0
       $query = "DELETE FROM ".cms_db_prefix()."group_perms WHERE permission_id = ?";
0
       $db->Execute($query, array($id));
0
 
0
-			$query = "DELETE FROM ".cms_db_prefix()."permissions WHERE permission_id = ?";
0
+			$query = "DELETE FROM ".cms_db_prefix()."permissions WHERE id = ?";
0
       $db->Execute($query, array($id));
0
     }
0
   }
0
@@ -1840,8 +1840,12 @@ abstract class CmsModuleBase extends CmsObject
0
    * ------------------------------------------------------------------
0
    */
0
 
0
-	public function list_templates($template_type)
0
+	public function list_templates($template_type = '')
0
   {
0
+		if( empty($template_type) )
0
+			{
0
+				return cms_orm('CmsModuleTemplate')->find_all_by_module($this->get_name());
0
+			}
0
     return cms_orm('CmsModuleTemplate')->find_all_by_module_and_template_type($this->get_name(), $template_type);
0
   }
0
 
0
@@ -1893,13 +1897,35 @@ abstract class CmsModuleBase extends CmsObject
0
     }
0
   }
0
 
0
-	public function delete_template($template_type, $template_name)
0
+	public function delete_template($template_type = '', $template_name = '')
0
   {
0
-		$template = cms_orm('CmsModuleTemplate')->find_by_module_and_template_type_and_name($this->get_name(), $template_type, $template_name);
0
-		if ($template != null)
0
-		{
0
-			return $template->delete();
0
-		}
0
+		if( $template_type != '' && $template_name != '' )
0
+			{
0
+				$template = cms_orm('CmsModuleTemplate')->find_by_module_and_template_type_and_name($this->get_name(), $template_type, $template_name);
0
+				if ($template != null)
0
+					{
0
+						return $template->delete();
0
+					}
0
+			}
0
+		else if( $template_type != '' && empty($template_name) )
0
+			{
0
+				$template = cms_orm('CmsModuleTemplate')->find_by_module_and_template_type($this->get_name(), $template_type);
0
+				foreach( $templates as $one )
0
+					{
0
+						$template->delete();
0
+					}
0
+				return true;
0
+			}
0
+		else if( empty($template_type) && empty($template_name) )
0
+			{
0
+				$templates = cms_orm('CmsModuleTemplate')->find_by_module($this->get_name());
0
+				foreach( $templates as $one )
0
+					{
0
+						$template->delete();
0
+					}
0
+				return true;
0
+			}
0
+		return false;
0
   }
0
 
0
   public function is_file_template_cached($template_name, $designation = '', $timestamp = '', $cache_id = '')