[Phpgroupware-cvs] [18964] some more improvements to country class generator and generate a new version

[Dave Hall]

Revision: 18964
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18964
Author:   skwashd
Date:     2008-10-06 10:40:16 +0000 (Mon, 06 Oct 2008)

Log Message:
-----------
some more improvements to country class generator and generate a new version

Modified Paths:
--------------
    modules/phpgwapi/trunk/doc/generate-class-country.php
    modules/phpgwapi/trunk/inc/class.country.inc.php

Modified: modules/phpgwapi/trunk/doc/generate-class-country.php
===================================================================
--- modules/phpgwapi/trunk/doc/generate-class-country.php       2008-10-06 
10:33:45 UTC (rev 18963)
+++ modules/phpgwapi/trunk/doc/generate-class-country.php       2008-10-06 
10:40:16 UTC (rev 18964)
@@ -121,7 +121,7 @@
                        if ( is_null($translated_list) )
                        {
                                 $translated_list = array();
-                                foreach ( phpgwapi_country::$country_array as 
$code => $name )
+                                foreach ( self::$country_array as $code => 
$name )
                                 {
                                        $translated = lang($name);
                                        if ( $translated == "{$name}*" )
@@ -141,7 +141,7 @@
                * @param string $code the 2 letter iso 3166 code
                * @return string the country name, empty string if invalid
                */
-               function get_full_name($selected)
+               public static function get_full_name($selected)
                {
                        if ( isset(self::$country_array[$selected]) )
                        {
@@ -157,7 +157,7 @@
                * @param string $select_name the name of the select box element 
in the form
                * @return array list of continents
                */
-               function xslt_continent_select($selected = '',$select_name='')
+               public function xslt_continent_select($selected = 
'',$select_name='')
                {
                        $GLOBALS['phpgw']->xslttpl->add_file('countries');
 
@@ -186,7 +186,7 @@
                * @param string $select_name the name of the select box element 
in the form
                * @return array list of countries
                */
-               function xslt_country_select($selected = '', $select_name='')
+               public function xslt_country_select($selected = '', 
$select_name='')
                {
                        $GLOBALS['phpgw']->xslttpl->add_file('countries');
 

Modified: modules/phpgwapi/trunk/inc/class.country.inc.php
===================================================================
--- modules/phpgwapi/trunk/inc/class.country.inc.php    2008-10-06 10:33:45 UTC 
(rev 18963)
+++ modules/phpgwapi/trunk/inc/class.country.inc.php    2008-10-06 10:40:16 UTC 
(rev 18964)
@@ -316,7 +316,7 @@
                        if ( is_null($translated_list) )
                        {
                                 $translated_list = array();
-                                foreach ( phpgwapi_country::$country_array as 
$code => $name )
+                                foreach ( self::$country_array as $code => 
$name )
                                 {
                                        $translated = lang($name);
                                        if ( $translated == "{$name}*" )
@@ -336,7 +336,7 @@
                * @param string $code the 2 letter iso 3166 code
                * @return string the country name, empty string if invalid
                */
-               function get_full_name($selected)
+               public static function get_full_name($selected)
                {
                        if ( isset(self::$country_array[$selected]) )
                        {
@@ -352,7 +352,7 @@
                * @param string $select_name the name of the select box element 
in the form
                * @return array list of continents
                */
-               function xslt_continent_select($selected = '',$select_name='')
+               public function xslt_continent_select($selected = 
'',$select_name='')
                {
                        $GLOBALS['phpgw']->xslttpl->add_file('countries');
 
@@ -381,7 +381,7 @@
                * @param string $select_name the name of the select box element 
in the form
                * @return array list of countries
                */
-               function xslt_country_select($selected = '', $select_name='')
+               public function xslt_country_select($selected = '', 
$select_name='')
                {
                        $GLOBALS['phpgw']->xslttpl->add_file('countries');