Changeset 5958

Timestamp:

Apr 25, 2010, 12:33:24 AM (14 years ago)

Author:

grum

Message:

Update changes for release 3.1.0

Location:

extensions/GrumPluginClasses

Files:

• classes/CommonPlugin.class.inc.php (modified) (1 diff)
• classes/GPCCore.class.inc.php (modified) (5 diffs)
• classes/GPCCss.class.inc.php (modified) (2 diffs)
• classes/genericjs.class.inc.php (modified) (2 diffs)
• css (added)
• css/gpc.css (added)
• gpc.css (deleted)
• main.inc.php (modified) (1 diff)

extensions/GrumPluginClasses/classes/CommonPlugin.class.inc.php

@@ -225 +225 @@
 
   /*
-    intialize plugin's events
+    initialize plugin's events
     to be surcharged by child's classes
   */

extensions/GrumPluginClasses/classes/GPCCore.class.inc.php

@@ -3 +3 @@
 /* -----------------------------------------------------------------------------
   class name     : GPCCore
-  class version  : 3.0.0
-  plugin version : 3.0.0
+  class version  : 1.1.0
+  plugin version : 3.1.0
   date           : 2010-03-30
   ------------------------------------------------------------------------------
@@ -14 +14 @@
 
 | release | date       |
-| 3.0.0   | 2010/03/30 | * Update class & function names
-|         |            |
+| 1.0.0   | 2010/03/30 | * Update class & function names
+|         |            |
+| 1.1.0   | 2010/03/30 | * add the BBtoHTML function
 |         |            |
 |         |            |
@@ -31 +32 @@
     - static function register
     - static function unregister
+    - static function BBtoHTML
    ---------------------------------------------------------------------- */
 
@@ -48 +50 @@
         Array('name' => "CommonPlugin", 'version' => "2.1.0"),
         Array('name' => "GPCAjax", 'version' => "3.0.0"),
-        Array('name' => "GPCCore", 'version' => "1.0.0"),
+        Array('name' => "GPCCore", 'version' => "1.1.0"),
         Array('name' => "GPCCss", 'version' => "3.0.0"),
         Array('name' => "GPCPagesNavigations", 'version' => "2.0.0"),
@@ -223 +225 @@
   }
 
+
+  /**
+   * convert (light) BB tag to HTML tag
+   *
+   * all BB codes are not recognized, only :
+   *  - [ul] [/ul]
+   *  - [li] [/li]
+   *  - [b] [/b]
+   *  - [i] [/i]
+   *  - [url] [/url]
+   *  - carriage return is replaced by a <br>
+   *
+   * @param String $text : text to convert
+   * @return String : BB to HTML text
+   */
+  static public function BBtoHTML($text)
+  {
+    $patterns = Array(
+      '/\[li\](.*?)\[\/li\]\n*/im',
+      '/\[b\](.*?)\[\/b\]/ism',
+      '/\[i\](.*?)\[\/i\]/ism',
+      '/\[url\]([\w]+?:\/\/[^ \"\n\r\t<]*?)\[\/url\]/ism',
+      '/\[url=([\w]+?:\/\/[^ \"\n\r\t<]*?)\](.*?)\[\/url\]/ism',
+      '/\n{0,1}\[ul\]\n{0,1}/im',
+      '/\n{0,1}\[\/ul\]\n{0,1}/im',
+      '/\n/im',
+    );
+    $replacements = Array(
+      '<li>\1</li>',
+      '<b>\1</b>',
+      '<i>\1</i>',
+      '<a href="\1">\1</a>',
+      '<a href="\1">\2</a>',
+      '<ul>',
+      '</ul>',
+      '<br>',
+    );
+
+    return(preg_replace($patterns, $replacements, $text));
+  }
+
 } //class
 

extensions/GrumPluginClasses/classes/GPCCss.class.inc.php

@@ -41 +41 @@
 {
   private $filename;
+
+  static public function applyGpcCss()
+  {
+    add_event_handler('loc_end_page_header', array('GPCCss', 'applyCSSFile'));
+  }
+
+  static public function applyCSSFile($fileName="")
+  {
+    global $template;
+
+    if($fileName=="")
+    {
+      //if no filename given, load the gpc.css file
+      $fileName=basename(dirname(dirname(__FILE__))).'/css/gpc.css';
+      $template->append('head_elements', '<link rel="stylesheet" type="text/css" href="plugins/'.$fileName.'">');
+    }
+    elseif(file_exists($fileName))
+    {
+      $template->append('head_elements', '<link rel="stylesheet" type="text/css" href="plugins/'.basename(dirname($fileName))."/".basename($fileName).'">');
+    }
+  }
 
   public function __construct($filename)
@@ -86 +107 @@
     global $template;
 
-    if($this->fileExists())
-    {
-      $template->append('head_elements', '<link rel="stylesheet" type="text/css" href="plugins/'.basename(dirname($this->filename))."/".basename($this->filename).'">');
-    }
+    GPCCss::applyCSSFile($this->filename);
   }
+
+
 } //class
 

extensions/GrumPluginClasses/classes/genericjs.class.inc.php

@@ -12 +12 @@
    this classes provides base functions to add genericjs.js file into html page
 
-   > see genericjs.js file to know javascript functions added 
+   > see genericjs.js file to know javascript functions added
 
     - constructor genericjs()
@@ -29 +29 @@
     global $template;
 
-    $name='plugins/'.basename(dirname(__FILE__)).'/genericjs.js';
+    $name='plugins/'.basename(dirname(dirname(__FILE__))).'/js/genericjs.js';
 
     $template->append('head_elements', '<script src="'.$name.'" type="text/javascript"></script>');

extensions/GrumPluginClasses/main.inc.php

@@ -42 +42 @@
 |         |            |   . it_IT
 |         |            |
-| 3.1.0   | 2010/04/18 | * add the GPCTabSheet class
+| 3.1.0   | 2010/04/24 | * add the GPCTabSheet class
+|         |            | * update the GPCCore class
 |         |            | * Add new languages
 |         |            |   . nl_NL