theme info (like plugin info)

diff --git a/include/plugin.php b/include/plugin.php
index 85b51edff506c5378db13f8fd8caf939a6e33c0e..57f77cb570342c0d0a24254d9f2bf9c76c0b94fe 100755 (executable)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -166,17 +166,73 @@ function call_hooks($name, &$data = null) {
 
 if (! function_exists('get_plugin_info')){
 function get_plugin_info($plugin){
-       if (!is_file("addon/$plugin/$plugin.php")) return false;
+       $info=Array(
+               'name' => $plugin,
+               'description' => "",
+               'author' => array(),
+               'version' => ""
+       );
+       
+       if (!is_file("addon/$plugin/$plugin.php")) return $info;
        
        $f = file_get_contents("addon/$plugin/$plugin.php");
        $r = preg_match("|/\*.*\*/|msU", $f, $m);
        
+       if ($r){
+               $ll = explode("\n", $m[0]);
+               foreach( $ll as $l ) {
+                       $l = trim($l,"\t\n\r */");
+                       if ($l!=""){
+                               list($k,$v) = array_map("trim", explode(":",$l,2));
+                               $k= strtolower($k);
+                               if ($k=="author"){
+                                       $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
+                                       if ($r) {
+                                               $info['author'][] = array('name'=>$m[1], 'link'=>$m[2]);
+                                       } else {
+                                               $info['author'][] = array('name'=>$v);
+                                       }
+                               } else {
+                                       if (array_key_exists($k,$info)){
+                                               $info[$k]=$v;
+                                       }
+                               }
+                               
+                       }
+               }
+               
+       }
+       return $info;
+}}
+
+
+/*
+ * parse theme comment in search of theme infos.
+ * like
+ *     
+ *      * Name: My Theme
+ *   * Description: My Cool Theme
+ *      * Version: 1.2.3
+ *   * Author: John <profile url>
+ *   * Maintainer: Jane <profile url>
+ *   *
+ */
+
+if (! function_exists('get_theme_info')){
+function get_theme_info($theme){
        $info=Array(
-               'name' => $plugin,
+               'name' => $theme,
                'description' => "",
                'author' => array(),
+               'maintainer' => array(),
                'version' => ""
        );
+
+       if (!is_file("view/theme/$theme/theme.php")) return $info;
+       
+       $f = file_get_contents("view/theme/$theme/theme.php");
+       $r = preg_match("|/\*.*\*/|msU", $f, $m);
+       
        
        if ($r){
                $ll = explode("\n", $m[0]);
@@ -192,6 +248,14 @@ function get_plugin_info($plugin){
                                        } else {
                                                $info['author'][] = array('name'=>$v);
                                        }
+                               }
+                               elseif ($k=="maintainer"){
+                                       $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
+                                       if ($r) {
+                                               $info['maintainer'][] = array('name'=>$m[1], 'link'=>$m[2]);
+                                       } else {
+                                               $info['maintainer'][] = array('name'=>$v);
+                                       }
                                } else {
                                        if (array_key_exists($k,$info)){
                                                $info[$k]=$v;

diff --git a/mod/admin.php b/mod/admin.php
index d9864dc6af0421a3a1d11d11f5255b99f9ba067c..9073d079f601ba2ba3a7e6899507fdfe9169b536 100755 (executable)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -741,7 +741,7 @@ function admin_page_themes(&$a){
                        '$plugin' => $theme,
                        '$status' => $status,
                        '$action' => $action,
-                       '$info' => array('name' => $theme,'version' => '','description' => ''), 
+                       '$info' => get_theme_info($theme),
                        '$function' => 'themes',                
                        '$admin_form' => $admin_form,
                        
@@ -758,7 +758,7 @@ function admin_page_themes(&$a){
        $xthemes = array();
        if($themes) {
                foreach($themes as $th) {
-                       $xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"),array('name' => $th['name'],'version' => '','description' => ''));     
+                       $xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
                }
        }
        

diff --git a/util/strings.php b/util/strings.php
index 0af841ce38f6e0e0290b5fe1d2264b631083bcfc..e70766d863fb870d1f7dd03b02983f30aa5789ca 100755 (executable)
--- a/util/strings.php
+++ b/util/strings.php
@@ -207,7 +207,7 @@ $a->strings["Enter full path to php executable"] = "";
 $a->strings["Command line PHP"] = "";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "";
 $a->strings["This is required for message delivery to work."] = "";
-$a->strings["PHP \"register_argc_argv\"] = "";
+$a->strings["PHP \"register_argc_argv\""] = "";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "";
 $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "";
 $a->strings["Generate encryption keys"] = "";

diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 5d63583f42ac3bbea15faf2b60a342560bb24196..e03bcc7b8ac26bcebf3f367e9b1ce68a3c5bc854 100755 (executable)
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -1,4 +1,11 @@
 <?php
+
+/*
+ * Name: Darkzero
+ * Version: 1.0
+ * Author: Mike Macgirvin <mike@macgirvin.com>
+ */
+
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );