Changeset 703 for trunk

Timestamp:

03/17/11 15:01:21 (14 months ago)

Author:

r2

Message:

всякое

Location:

trunk

Files:

• includes/bbcode/bbcode.lib.php (modified) (2 diffs)
• includes/graphic.inc.php (modified) (1 diff)
• plugins/p_loginza (added)
• plugins/p_loginza/auth.php (added)
• plugins/p_loginza/plugin.php (added)
• url_rewrite.php (modified) (4 diffs)

trunk/includes/bbcode/bbcode.lib.php

@@ -1182 +1182 @@
                 $url = $href;
                 $local = true;
+            } elseif (!strstr($href, '?')) {
+                $url = '/go/url='.htmlspecialchars($href);
+                $local = false;
             } else {
-                $url = '/go/url='.htmlspecialchars($this->process_url($href));
-                $local = false;
-            }
+                                $url = $href;
+                        }
             $attr .= ' href="'.$url.'"';
         }
@@ -1200 +1202 @@
     }
 
-  private function process_url($href){
-        return str_replace('?', '--q--', $href);
-  }
 }
 

trunk/includes/graphic.inc.php

@@ -72 +72 @@
   if ($size === false) return false;
 
-  $new_width   = $size[0];
-  $new_height  = $size[1];
-
   if (($new_height <= $maxheight) && ($new_width <= $maxwidth)){
       @copy($src, $dest);

trunk/url_rewrite.php

@@ -148 +148 @@
 
         $rules[] = array(
-                            'source'  => '/^content\/(.+).html$/i',
-                            'target'  => '/{1}.html',
-                            'action'  => 'redirect-301'
-                         );
-
-        $rules[] = array(
                             'source'  => '/^content\/(.+)\/page\-([0-9]+)$/i',
                             'target'  => '/{1}/page-{2}',
@@ -160 +154 @@
 
         $rules[] = array(
+                            'source'  => '/^content\/([0-9]+)\/(.+).html$/i',
+                            'target'  => '/{2}.html',
+                            'action'  => 'redirect-301'
+                         );
+
+        $rules[] = array(
+                            'source'  => '/^content\/([0-9]+)\/(.+)$/i',
+                            'target'  => '/{2}',
+                            'action'  => 'redirect-301'
+                         );
+
+        $rules[] = array(
                             'source'  => '/^content\/(.+)$/i',
                             'target'  => '/{1}',
@@ -166 +172 @@
 
         $rules[] = array(
-                            'source'  => '/^content\/([0-9]+)\/(.+).html$/i',
-                            'target'  => '/{2}.html',
-                            'action'  => 'redirect-301'
-                         );
-
-        $rules[] = array(
                             'source'  => '/^content\/([0-9]+)\/(.+)\/page\-([0-9]+).html$/i',
                             'target'  => '/{2}/page-{3}.html',
@@ -178 +178 @@
 
         $rules[] = array(
-                            'source'  => '/^content\/([0-9]+)\/(.+)$/i',
-                            'target'  => '/{2}',
-                            'action'  => 'redirect-301'
-                         );
-
-        $rules[] = array(
                             'source'  => '/^content\/([0-9]+)\/(.+)\/page\-([0-9]+)$/i',
                             'target'  => '/{2}/page-{3}',