Small, but dumb fix for php bug.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1425 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/functions_list.inc b/include/functions_list.inc
index 9013ec2abf048eca2e03691f66902469b1f6cc98..1cfcc492afc84feaa205dc11695f7a5685493221 100644 (file)
--- a/include/functions_list.inc
+++ b/include/functions_list.inc
@@ -1,264 +1,263 @@
 <?php
 array (
-  0 => 'print_r',
-  1 => 'test_defined_functions',
-  2 => 'touch',
-  3 => 'fopen',
-  4 => 'fwrite',
-  5 => 'var_export',
+  0 => 'touch',
+  1 => 'fopen',
+  2 => 'fwrite',
+  3 => 'var_export',
+  4 => 'fclose',
+  5 => 'header',
   6 => 'session_start',
-  7 => 'header',
-  8 => 'error_reporting',
-  9 => 'putenv',
-  10 => 'setlocale',
-  11 => 'bindtextdomain',
-  12 => 'textdomain',
-  13 => 'sprintf',
-  14 => 'str_replace',
-  15 => 'gmdate',
-  16 => 'imageAlphaBlending',
-  17 => 'imageSaveAlpha',
-  18 => 'imagesx',
-  19 => 'imagesy',
-  20 => 'imagecopy',
-  21 => 'imagePng',
-  22 => 'mysql_pconnect',
-  23 => 'mysql_select_db',
-  24 => 'mysql_query',
-  25 => 'mysql_fetch_array',
-  26 => 'mysql_result',
-  27 => 'mysql_close',
-  28 => 'tempnam',
-  29 => 'fclose',
-  30 => 'popen',
-  31 => 'fread',
-  32 => 'pclose',
-  33 => 'unlink',
-  34 => 'imagick_blob2image',
-  35 => 'imagick_image2blob',
-  36 => 'preg_match',
-  37 => 'base64_decode',
-  38 => 'preg_replace',
-  39 => 'srand',
-  40 => 'strlen',
-  41 => 'date',
-  42 => 'preg_split',
-  43 => 'trim',
-  44 => 'chr',
-  45 => 'chunk_split',
-  46 => 'is_dir',
-  47 => 'is_writable',
-  48 => 'session_destroy',
-  49 => 'substr',
-  50 => 'tidy_parse_string',
-  51 => 'tidy_clean_repair',
-  52 => 'tidy_error_count',
-  53 => 'tidy_warning_count',
-  54 => 'nl2br',
-  55 => 'intval',
-  56 => 'ImageFontWidth',
-  57 => 'ImageFontHeight',
-  58 => 'imagecolorallocate',
-  59 => 'imagerectangle',
-  60 => 'imagefilledrectangle',
-  61 => 'imagestring',
-  62 => 'imagepng',
-  63 => 'imagedestroy',
-  64 => 'is_int',
-  65 => 'session_id',
-  66 => 'define',
-  67 => 'base64_encode',
-  68 => 'debug_backtrace',
-  69 => 'htmlentities',
-  70 => 'flush',
-  71 => 'dirname',
-  72 => 'set_error_handler',
-  73 => 'ini_set',
-  74 => 'chdir',
-  75 => 'opendir',
-  76 => 'readdir',
-  77 => 'closedir',
-  78 => 'explode',
-  79 => 'microtime',
-  80 => 'split',
-  81 => 'strtoupper',
-  82 => 'syslog',
-  83 => 'md5',
-  84 => 'arsort',
-  85 => 'reset',
-  86 => 'ltrim',
-  87 => 'strstr',
-  88 => 'rtrim',
-  89 => 'array_flip',
-  90 => 'preg_quote',
-  91 => 'func_get_args',
-  92 => 'cups_get_dest_list',
-  93 => 'cups_get_printer_attributes',
+  7 => 'error_reporting',
+  8 => 'putenv',
+  9 => 'setlocale',
+  10 => 'bindtextdomain',
+  11 => 'textdomain',
+  12 => 'sprintf',
+  13 => 'str_replace',
+  14 => 'gmdate',
+  15 => 'imageAlphaBlending',
+  16 => 'imageSaveAlpha',
+  17 => 'imagesx',
+  18 => 'imagesy',
+  19 => 'imagecopy',
+  20 => 'imagePng',
+  21 => 'mysql_pconnect',
+  22 => 'mysql_select_db',
+  23 => 'mysql_query',
+  24 => 'mysql_fetch_array',
+  25 => 'mysql_result',
+  26 => 'mysql_close',
+  27 => 'tempnam',
+  28 => 'popen',
+  29 => 'fread',
+  30 => 'pclose',
+  31 => 'unlink',
+  32 => 'imagick_blob2image',
+  33 => 'imagick_image2blob',
+  34 => 'preg_match',
+  35 => 'base64_decode',
+  36 => 'preg_replace',
+  37 => 'srand',
+  38 => 'strlen',
+  39 => 'date',
+  40 => 'preg_split',
+  41 => 'trim',
+  42 => 'chr',
+  43 => 'chunk_split',
+  44 => 'is_dir',
+  45 => 'is_writable',
+  46 => 'session_destroy',
+  47 => 'substr',
+  48 => 'tidy_parse_string',
+  49 => 'tidy_clean_repair',
+  50 => 'tidy_error_count',
+  51 => 'tidy_warning_count',
+  52 => 'nl2br',
+  53 => 'intval',
+  54 => 'ImageFontWidth',
+  55 => 'ImageFontHeight',
+  56 => 'imagecolorallocate',
+  57 => 'imagerectangle',
+  58 => 'imagefilledrectangle',
+  59 => 'imagestring',
+  60 => 'imagepng',
+  61 => 'imagedestroy',
+  62 => 'is_int',
+  63 => 'session_id',
+  64 => 'imap_close',
+  65 => 'is_array',
+  66 => 'imap_listmailbox',
+  67 => 'imap_utf7_decode',
+  68 => 'imap_last_error',
+  69 => 'imap_getacl',
+  70 => 'imap_setacl',
+  71 => 'rtrim',
+  72 => 'strpos',
+  73 => 'is_integer',
+  74 => 'implode',
+  75 => 'file',
+  76 => 'opendir',
+  77 => 'time',
+  78 => 'readdir',
+  79 => 'strstr',
+  80 => 'filesize',
+  81 => 'stat',
+  82 => 'asort',
+  83 => 'closedir',
+  84 => 'split',
+  85 => 'preg_match_all',
+  86 => 'array_reverse',
+  87 => 'array_slice',
+  88 => 'ksort',
+  89 => 'dechex',
+  90 => 'htmlentities',
+  91 => 'strip_tags',
+  92 => 'stripcslashes',
+  93 => 'get_class',
   94 => 'exec',
-  95 => 'session_unregister',
-  96 => 'pow',
-  97 => 'key',
-  98 => 'current',
-  99 => 'array_merge',
-  100 => 'strtolower',
-  101 => 'mt_srand',
-  102 => 'mt_rand',
-  103 => 'mb_substr',
-  104 => 'is_link',
-  105 => 'sort',
-  106 => 'array_reverse',
-  107 => 'is_readable',
-  108 => 'is_file',
-  109 => 'filesize',
-  110 => 'dechex',
+  95 => 'ldap_connect',
+  96 => 'ldap_set_option',
+  97 => 'ldap_set_rebind_proc',
+  98 => 'ldap_get_values_len',
+  99 => 'ldap_unbind',
+  100 => 'reset',
+  101 => 'ldap_bind',
+  102 => 'ldap_read',
+  103 => 'ldap_get_entries',
+  104 => 'array_flip',
+  105 => 'version_compare',
+  106 => 'function_exists',
+  107 => 'shell_exec',
+  108 => 'system',
+  109 => 'ini_get',
+  110 => 'posix_getgrgid',
   111 => 'crypt',
-  112 => 'imap_close',
-  113 => 'is_array',
-  114 => 'imap_listmailbox',
-  115 => 'imap_utf7_decode',
-  116 => 'imap_last_error',
-  117 => 'imap_getacl',
-  118 => 'imap_setacl',
-  119 => 'strpos',
-  120 => 'is_integer',
-  121 => 'implode',
-  122 => 'file',
-  123 => 'uniqid',
-  124 => 'htmlspecialchars',
-  125 => 'serialize',
-  126 => 'hexdec',
-  127 => 'gettype',
-  128 => 'get_object_vars',
-  129 => 'is_object',
-  130 => 'mysql_num_fields',
-  131 => 'mysql_field_name',
-  132 => 'mysql_data_seek',
-  133 => 'preg_match_all',
-  134 => 'stripcslashes',
-  135 => 'get_class',
-  136 => 'ldap_connect',
-  137 => 'ldap_set_option',
-  138 => 'ldap_set_rebind_proc',
-  139 => 'ldap_get_values_len',
-  140 => 'ldap_unbind',
-  141 => 'asort',
-  142 => 'function_exists',
-  143 => 'sha1',
-  144 => 'get_declared_classes',
-  145 => 'escapeshellarg',
-  146 => 'get_class_vars',
-  147 => 'array_keys',
-  148 => 'ldap_bind',
-  149 => 'ldap_read',
-  150 => 'ldap_get_entries',
-  151 => 'version_compare',
-  152 => 'shell_exec',
-  153 => 'system',
-  154 => 'ini_get',
-  155 => 'posix_getgrgid',
-  156 => 'xml_parser_create',
-  157 => 'xml_set_object',
-  158 => 'xml_set_element_handler',
-  159 => 'chop',
-  160 => 'xml_error_string',
-  161 => 'xml_get_current_line_number',
-  162 => 'printf',
-  163 => 'kadm5_init_with_password',
-  164 => 'kadm5_chpass_principal',
-  165 => 'kadm5_destroy',
-  166 => 'recode',
-  167 => 'iconv',
-  168 => 'ord',
-  169 => 'time',
-  170 => 'stat',
-  171 => 'array_slice',
-  172 => 'ksort',
-  173 => 'strip_tags',
-  174 => 'getcwd',
-  175 => 'fgets',
-  176 => 'is_callable',
-  177 => 'call_user_func_array',
-  178 => 'array_unique',
-  179 => 'usort',
-  180 => 'substr_count',
-  181 => 'end',
-  182 => 'strtr',
-  183 => 'strftime',
-  184 => 'each',
-  185 => 'array_values',
-  186 => 'array_pop',
-  187 => 'array_count_values',
-  188 => 'array_push',
-  189 => 'array_splice',
-  190 => 'in_array',
-  191 => 'array_shift',
-  192 => 'addslashes',
-  193 => 'rsort',
-  194 => 'is_numeric',
-  195 => 'settype',
-  196 => 'ob_start',
-  197 => 'ob_get_contents',
-  198 => 'ob_end_clean',
-  199 => 'file_exists',
-  200 => 'filemtime',
-  201 => 'urlencode',
-  202 => 'crc32',
-  203 => 'basename',
-  204 => 'array_unshift',
-  205 => 'next',
-  206 => 'round',
+  112 => 'strtolower',
+  113 => 'get_declared_classes',
+  114 => 'mt_srand',
+  115 => 'microtime',
+  116 => 'escapeshellarg',
+  117 => 'flush',
+  118 => 'current',
+  119 => 'printf',
+  120 => 'print_r',
+  121 => 'kadm5_init_with_password',
+  122 => 'kadm5_chpass_principal',
+  123 => 'kadm5_destroy',
+  124 => 'base64_encode',
+  125 => 'sha1',
+  126 => 'define',
+  127 => 'getcwd',
+  128 => 'array_merge',
+  129 => 'chdir',
+  130 => 'fgets',
+  131 => 'debug_backtrace',
+  132 => 'dirname',
+  133 => 'set_error_handler',
+  134 => 'ini_set',
+  135 => 'uniqid',
+  136 => 'htmlspecialchars',
+  137 => 'serialize',
+  138 => 'hexdec',
+  139 => 'gettype',
+  140 => 'get_object_vars',
+  141 => 'is_object',
+  142 => 'mysql_num_fields',
+  143 => 'mysql_field_name',
+  144 => 'mysql_data_seek',
+  145 => 'explode',
+  146 => 'strtoupper',
+  147 => 'syslog',
+  148 => 'md5',
+  149 => 'arsort',
+  150 => 'ltrim',
+  151 => 'preg_quote',
+  152 => 'func_get_args',
+  153 => 'cups_get_dest_list',
+  154 => 'cups_get_printer_attributes',
+  155 => 'session_unregister',
+  156 => 'pow',
+  157 => 'key',
+  158 => 'mt_rand',
+  159 => 'mb_substr',
+  160 => 'is_link',
+  161 => 'sort',
+  162 => 'is_readable',
+  163 => 'is_file',
+  164 => 'get_class_vars',
+  165 => 'array_keys',
+  166 => 'xml_parser_create',
+  167 => 'xml_set_object',
+  168 => 'xml_set_element_handler',
+  169 => 'chop',
+  170 => 'xml_error_string',
+  171 => 'xml_get_current_line_number',
+  172 => 'recode',
+  173 => 'iconv',
+  174 => 'ord',
+  175 => 'is_callable',
+  176 => 'call_user_func_array',
+  177 => 'array_unique',
+  178 => 'usort',
+  179 => 'substr_count',
+  180 => 'end',
+  181 => 'strtr',
+  182 => 'strftime',
+  183 => 'each',
+  184 => 'array_values',
+  185 => 'array_pop',
+  186 => 'array_count_values',
+  187 => 'array_push',
+  188 => 'array_splice',
+  189 => 'in_array',
+  190 => 'array_shift',
+  191 => 'addslashes',
+  192 => 'rsort',
+  193 => 'is_numeric',
+  194 => 'settype',
+  195 => 'ob_start',
+  196 => 'ob_get_contents',
+  197 => 'ob_end_clean',
+  198 => 'file_exists',
+  199 => 'filemtime',
+  200 => 'urlencode',
+  201 => 'crc32',
+  202 => 'basename',
+  203 => 'array_unshift',
+  204 => 'next',
+  205 => 'round',
+  206 => 'preg_grep',
   207 => 'rawurlencode',
   208 => 'bin2hex',
-  209 => 'preg_grep',
-  210 => 'str_repeat',
-  211 => 'extract',
-  212 => 'preg_replace_callback',
-  213 => 'ucfirst',
-  214 => 'wordwrap',
-  215 => 'substr_replace',
-  216 => 'ceil',
-  217 => 'floor',
-  218 => 'array_map',
-  219 => 'range',
-  220 => 'strtotime',
-  221 => 'mktime',
-  222 => 'parse_url',
-  223 => 'fsockopen',
-  224 => 'fputs',
-  225 => 'token_get_all',
-  226 => 'unserialize',
-  227 => 'realpath',
-  228 => 'strncmp',
+  209 => 'str_repeat',
+  210 => 'extract',
+  211 => 'preg_replace_callback',
+  212 => 'ucfirst',
+  213 => 'wordwrap',
+  214 => 'substr_replace',
+  215 => 'ceil',
+  216 => 'floor',
+  217 => 'array_map',
+  218 => 'range',
+  219 => 'strtotime',
+  220 => 'mktime',
+  221 => 'parse_url',
+  222 => 'fsockopen',
+  223 => 'fputs',
+  224 => 'token_get_all',
+  225 => 'unserialize',
+  226 => 'realpath',
+  227 => 'strncmp',
+  228 => 'mysql_fetch_row',
   229 => 'array_search',
   230 => 'array_key_exists',
-  231 => 'mysql_fetch_row',
-  232 => 'mysql_error',
-  233 => 'utf8_encode',
-  234 => 'file_get_contents',
-  235 => 'stripslashes',
-  236 => 'natcasesort',
-  237 => 'uasort',
-  238 => 'strcasecmp',
-  239 => 'rand',
-  240 => 'imagick_ReadImage',
-  241 => 'imagick_free',
-  242 => 'strrchr',
-  243 => 'sleep',
-  244 => 'array_chunk',
-  245 => 'natsort',
-  246 => 'pg_connect',
-  247 => 'pg_exec',
-  248 => 'pg_close',
-  249 => 'pg_set_client_encoding',
-  250 => 'pg_freeresult',
-  251 => 'getdate',
-  252 => 'is_uploaded_file',
-  253 => 'ldap_start_tls',
-  254 => 'ldap_mod_del',
-  255 => 'ldap_close',
-  256 => 'kadm5_get_principals',
-  257 => 'kadm5_delete_principal',
-  258 => 'kadm5_create_principal',
-  259 => 'join',
+  231 => 'mysql_error',
+  232 => 'utf8_encode',
+  233 => 'file_get_contents',
+  234 => 'stripslashes',
+  235 => 'natcasesort',
+  236 => 'uasort',
+  237 => 'strcasecmp',
+  238 => 'rand',
+  239 => 'imagick_ReadImage',
+  240 => 'imagick_free',
+  241 => 'strrchr',
+  242 => 'sleep',
+  243 => 'array_chunk',
+  244 => 'natsort',
+  245 => 'pg_connect',
+  246 => 'pg_exec',
+  247 => 'pg_close',
+  248 => 'pg_set_client_encoding',
+  249 => 'pg_freeresult',
+  250 => 'getdate',
+  251 => 'is_uploaded_file',
+  252 => 'ldap_start_tls',
+  253 => 'ldap_mod_del',
+  254 => 'ldap_close',
+  255 => 'kadm5_get_principals',
+  256 => 'kadm5_delete_principal',
+  257 => 'kadm5_create_principal',
+  258 => 'join',
 )
 ?>
\ No newline at end of file

diff --git a/include/functions_test.inc b/include/functions_test.inc
index 713ba63899fe1e1a093c852c97d345692c5529d3..23141788d8b64f0795daf4826b395968060f0cf3 100644 (file)
--- a/include/functions_test.inc
+++ b/include/functions_test.inc
@@ -75,7 +75,8 @@ function test_defined_functions($path="",$pattern="",$skip_dirs="") {
   $array= read_php_files($path,$pattern,$skip_dirs);
 
   $functions= array();
-  $user_functions= array();
+  // We need to add our own method here, cause PHP doesn't scan 'itself' :-(
+  $user_functions= array('test_defined_functions');
   
   // Scan files for used defined functions
   foreach($array as $file) {
@@ -143,7 +144,8 @@ function test_functions($path="",$pattern="",$skip_dirs="") {
   }
 
   $functions= array();
-  $user_functions= array();
+  // We need to add our own method here, cause PHP doesn't scan 'itself' :-(
+  $user_functions= array('test_functions');
   $invalid_functions= array();
   
   if($debug || $verbose) {
@@ -198,7 +200,6 @@ function test_functions($path="",$pattern="",$skip_dirs="") {
 }
 
 /**
- * @see
  * @return array of content from PHP-Files scanned
  */
 function read_php_files($path,$pattern,$skip_dirs) {