Changeset 738

Timestamp:

03/30/11 12:17:19 (14 months ago)

Author:

r2

Message:

вставка видео вконтакте и новый код ютуба

Location:

trunk

Files:

• components/clubs/frontend.php (modified) (1 diff)
• components/content/frontend.php (modified) (1 diff)
• components/forum/frontend.php (modified) (1 diff)
• core/cms.php (modified) (1 diff)
• includes/bbcode/bbcode.lib.php (modified) (1 diff)

trunk/components/clubs/frontend.php

@@ -273 +273 @@
         //save to database
         $description            = $inCore->request('description', 'html', '');
-                $description            = $inCore->badTagClear($description);
+        $description            = $inCore->badTagClear($description);
         $description            = $inDB->escape_string($description);
         $admin_id                       = $club['admin_id'];

trunk/components/content/frontend.php

@@ -410 +410 @@
 
         $article['published']           = $is_auto_add ? 1 : 0;
-                if ($do=='editarticle'){
-                        $article['published']           = ($mod['published'] == 0) ? $mod['published'] : $article['published'];
-                }
+          if ($do=='editarticle'){
+               $article['published']           = ($mod['published'] == 0) ? $mod['published'] : $article['published'];
+          }
         $article['pubdate']             = $mod['pubdate'] ? $mod['pubdate'] : date('Y-m-d H:i');
         $article['enddate']             = $article['pubdate'];

trunk/components/forum/frontend.php

@@ -784 +784 @@
                 } else {
                 $message_post = $inCore->request('message', 'html');
-                $message = $inDB->escape_string($message_post);
                 $message = $inCore->badTagClear($message);
+                $message = $inDB->escape_string($message_post);                
                 if (!$message) { echo '<p>'.$_LANG['NEED_TEXT_POST'].'</p>'; return; }
 

trunk/core/cms.php

@@ -3232 +3232 @@
      */
     public static function badTagClear($string){
-                $bad_teg = array ("'<script[^>]*?>.*?</script>'si",
-                                                 "'<iframe[^>]*?>.*?</iframe>'si",
-                                                 "'<style[^>]*?>.*?</style>'si",
-                                                 "'<meta[^>]*?>'si");
-                $string = preg_replace($bad_teg, '', $string);
+
+        $bad_tags = array (
+            "'<script[^>]*?>.*?</script>'si",
+            "'<style[^>]*?>.*?</style>'si",
+            "'<meta[^>]*?>'si",
+            '/<iframe.*?src=(?!"http:\/\/www\.youtube\.com\/embed\/|"http:\/\/vkontakte\.ru\/video_ext\.php\?).*?>.*?<\/iframe>/i',
+            '/<iframe.*>.+<\/iframe>/i'
+        );
+
+        $string = preg_replace($bad_tags, '', $string);
+
         return $string;
+        
     }
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

trunk/includes/bbcode/bbcode.lib.php

@@ -1006 +1006 @@
         $str = '<div class="bb_tag_video">';
         foreach ($elem['val'] as $item) {
+            
             if ('item'==$item['type']) { continue; }
-            $str .= strip_tags($item['str'], '<object><param><embed>');
+
+            $iframe_regexp      = '/<iframe.*?src=(?!"http:\/\/www\.youtube\.com\/embed\/|"http:\/\/vkontakte\.ru\/video_ext\.php\?).*?><\/iframe>/i';
+            $iframe_regexp2     = '/<iframe.*>.+<\/iframe>/i';
+            $item['str']        = preg_replace($iframe_regexp, '', $item['str']);
+            $item['str']        = preg_replace($iframe_regexp2, '', $item['str']);
+
+            $str .= strip_tags($item['str'], '<iframe><object><param><embed>');
+
         }
         $str .= '</div>';