Changeset 6733 for extensions

Timestamp:

Jul 29, 2010, 2:58:50 PM (14 years ago)

Author:

grum

Message:

some file forgotten in the previous commit...

Location:

extensions/GrumPluginClasses

Files:

• classes/CommonPlugin.class.inc.php (modified) (4 diffs)
• classes/GPCCore.class.inc.php (modified) (8 diffs)
• css/gpc.css (modified) (1 diff)

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

@@ -2 +2 @@
 /* -----------------------------------------------------------------------------
   class name: CommonPlugin
-  class version  : 2.1.0
+  class version  : 2.2.0
   plugin version : 3.0.0
-  date           : 2010-03-30
+  date           : 2010-07-28
 
   ------------------------------------------------------------------------------
@@ -27 +27 @@
     - initConfig()
     - loadConfig()
+    - loadConfigFromFile()
     - saveConfig()
     - deleteConfig()
@@ -46 +47 @@
 |         |            | * Update class & function names
 |         |            |
-|         |            |
+| 2.2.0   | 2010/07/28 | * Add the loadConfigFromFile function
 |         |            |
 |         |            |
@@ -170 +171 @@
   }
 
+  /**
+   * load config from a file into var $my_config
+   *
+   * this function don't initialize the default value !
+   * if needed, use the loadConfig() function before using it
+   *
+   * @param String $fileName : name of file to load
+   */
+  public function loadConfigFromFile($fileName)
+  {
+    return(GPCCore::loadConfigFromFile($fileName, $this->config));
+  }
+
   /* save var $my_config into CONFIG_TABLE */
   public function saveConfig()

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

@@ -3 +3 @@
 /* -----------------------------------------------------------------------------
   class name     : GPCCore
-  class version  : 1.1.0
-  plugin version : 3.1.0
-  date           : 2010-03-30
+  class version  : 1.2.0
+  plugin version : 3.2.0
+  date           : 2010-07-28
   ------------------------------------------------------------------------------
   author: grum at piwigo.org
@@ -18 +18 @@
 | 1.1.0   | 2010/03/30 | * add the BBtoHTML function
 |         |            |
+| 1.2.0   | 2010/07/28 | * add the loadConfigFromFile function
 |         |            |
 |         |            |
@@ -26 +27 @@
     no constructor, only static function are provided
     - static function loadConfig
+    - static function loadConfigFromFile
     - static function saveConfig
     - static function deleteConfig
@@ -48 +50 @@
     return(
       Array(
-        Array('name' => "CommonPlugin", 'version' => "2.1.0"),
+        Array('name' => "CommonPlugin", 'version' => "2.2.0"),
         Array('name' => "GPCAjax", 'version' => "3.0.0"),
-        Array('name' => "GPCCore", 'version' => "1.1.0"),
+        Array('name' => "GPCCore", 'version' => "1.2.0"),
         Array('name' => "GPCCss", 'version' => "3.0.0"),
         Array('name' => "GPCPagesNavigations", 'version' => "2.0.0"),
@@ -56 +58 @@
         Array('name' => "GPCRequestBuilder", 'version' => "1.0.0"),
         Array('name' => "GPCTables", 'version' => "1.5.0"),
-        Array('name' => "GPCTabSheet", 'version' => "1.0.0"),
+        Array('name' => "GPCTabSheet", 'version' => "1.1.0"),
         Array('name' => "GPCTranslate", 'version' => "2.1.0"),
         Array('name' => "GPCUsersGroups", 'version' => "2.0.0"),
@@ -189 +191 @@
 
   /**
+   *  load config from a file into an array
+   *
+   *  note : the config file is a PHP file one var $conf used as an array,
+   *  like the piwigo $conf var
+   *
+   * @param String $fileName : the file name
+   * @param Array $config : array, initialized or not with default values ; the
+   *                        config values are loaded in this value
+   * @return Boolean : true if config is loaded, otherwise false
+   */
+  static public function loadConfigFromFile($fileName, &$config=Array())
+  {
+    $conf=array();
+
+    if(!is_array($config) or !file_exists($fileName))
+    {
+      return(false);
+    }
+
+    include_once($fileName);
+
+    foreach($conf as $key=>$val)
+    {
+      $config[$key]=$val;
+    }
+    return(true);
+  }
+
+
+  /**
    * save var $my_config into CONFIG_TABLE
    *
@@ -247 +279 @@
       '/\[b\](.*?)\[\/b\]/ism',
       '/\[i\](.*?)\[\/i\]/ism',
+      '/\[p\](.*?)\[\/p\]/ism',
       '/\[url\]([\w]+?:\/\/[^ \"\n\r\t<]*?)\[\/url\]/ism',
       '/\[url=([\w]+?:\/\/[^ \"\n\r\t<]*?)\](.*?)\[\/url\]/ism',
@@ -257 +290 @@
       '<b>\1</b>',
       '<i>\1</i>',
+      '<p>\1</p>',
       '<a href="\1">\1</a>',
       '<a href="\1">\2</a>',

extensions/GrumPluginClasses/css/gpc.css

@@ -15 +15 @@
 .pctBarclear { height:6px; background:#005E89; }
 li.groupItems { border:1px solid #666666; margin-bottom:5px; padding:0 5px; width:90%; cursor:move; padding:4px;
--moz-border-radius:8px;
--webkit-border-radius:8px;
--khtml-border-radius:8px;
-border-radius:8px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+-khtml-border-radius:4px;
+border-radius:4px;
 }