Changeset 128 for trunk

Timestamp:

01/05/2006 01:43:46 AM (6 years ago)

Author:

paravoid

Message:

Cleanup globals/functions.php

Location:

trunk

Files:

• globals/classes/construct.php (modified) (2 diffs)
• globals/functions.php (modified) (7 diffs)
• includes/pages/nodes/nodes_plot.php (modified) (1 diff)

trunk/globals/classes/construct.php

@@ -24 +24 @@
         function form($form, $template='constructors/form.tpl') {
                 global $smarty;
-                //echo pvar($data);
                 if (substr(strrchr($template, "."), 1) != "tpl") {
                         $path_parts = pathinfo($template);
@@ -48 +47 @@
                         }
                 }
-                //echo pvar($table->data);
                 return template(array("data" => $table->data, "extra_data" => $table->info, "hidden_qs" => get_qs()), $template);
         }

trunk/globals/functions.php

@@ -20 +20 @@
  */
 
-function pvar($var) {
-        if (is_array($var)) {
-                $ret .= '<ul>';
-                while(list($key) = each($var)) {
-                        if (is_array($var[$key])) {
-                                $ret .= '<li>'.$key.pvar($var[$key]).'</li>';
-                        } else {
-                                $ret .= '<li>'.$key.' = '.$var[$key].'</li>';
-                        }
-                }
-                $ret .= '</ul>';                
-                return $ret;
-        } else {
-                return $var;
-        }
-}
-
 function redirect($url, $sec=0, $exit=TRUE) {
         global $main;
@@ -46 +29 @@
         if (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) || $sec>0) {
                 header("Refresh: $sec; URL=".html_entity_decode($url));
-                global $main;
                 $main->html->head->add_meta("$sec; url=$url", "", "refresh");
         } else {
@@ -102 +84 @@
 }
 
-function getdirlist ($dirName, $dirs=TRUE, $files=FALSE) { 
+function getdirlist($dirName, $dirs=TRUE, $files=FALSE) { 
         $d = dir($dirName);
         $a = array();
@@ -132 +114 @@
 }
 
-function query_str ($params) {
+function query_str($params) {
    $str = '';
    foreach( (array) $params as $key => $value) {
@@ -243 +225 @@
 }
 
-function sendmail_fromlang($to, $message) {
-        global $lang;
-        return sendmail($to, $lang['email'][$message]['subject'], $lang['email'][$message]['body']);
-}
-
 function correct_ip($ip, $ret_null=TRUE) {
         if ($ip == '' && $ret_null === TRUE) return '';
@@ -295 +272 @@
 }
 
-function is_ip ($ip, $full_ip=TRUE) {
+function is_ip($ip, $full_ip=TRUE) {
         $ip_ex = explode(".", $ip, 4);
         if ($ip == '') return FALSE;
@@ -332 +309 @@
 } 
 
-function array_multimerge ($array1, $array2) {
+function array_multimerge($array1, $array2) {
         if (is_array($array2) && count($array2)) {
                 foreach ($array2 as $k => $v) {

trunk/includes/pages/nodes/nodes_plot.php

@@ -40 +40 @@
                 $point_a = new elevation($a_node[0]['latitude'], $a_node[0]['longitude']);
                 $point_b = new elevation($b_node[0]['latitude'], $b_node[0]['longitude']);
-                //echo pvar($a_node);
-                //echo pvar($b_node);
                 $image = plotlink($width, $height, $point_a, $point_b, (integer)$a_node[0]['elevation'], (integer)$b_node[0]['elevation']);