Move global function into static class method

diff --git a/Styles/phptools.inc b/Styles/phptools.inc
index 37dbbb4..2346e74 100644 (file)
--- a/Styles/phptools.inc
+++ b/Styles/phptools.inc
@@ -18,38 +18,6 @@
 ?>
 </define-tag>
 
-<define-tag form_to_yyyymmdd>
-<?
-  function form_to_yyyymmdd ($date)
-  {
-    if (strlen ($date) > 0) {
-      $datum = explode (".", $date);
-
-      if (count($datum) > 1) {
-       if (strlen ($datum[1]) == 0) {
-         $datum[1] = date ("m");
-       }
-       if (strlen ($datum[2]) == 0) {
-         if ($datum[1] == '12' && date('m') == '1')
-           $datum[2] = date ("Y", time() - 60*60*24*(date('d')+1));
-         else
-           $datum[2] = date ("Y");
-       } elseif (strlen ($datum[2]) == 1) {
-         $datum[2] = "200" . $datum[2];
-       } elseif (strlen ($datum[2]) == 2) {
-         $datum[2] = "20" . $datum[2];
-       }
-
-       $date = $datum[2] . "-" . $datum[1] . "-" . $datum[0];
-      }
-    } else {
-      $date = date ("Y-m-j");
-    }
-    return $date;
-  }
-?>
-</define-tag>
-
 <define-tag teaserlink>
 <?
 function teaserlink($teaser)

diff --git a/class/functions.class.php b/class/functions.class.php
new file mode 100644 (file)
index 0000000..174eade
--- /dev/null
+++ b/class/functions.class.php
@@ -0,0 +1,32 @@
+<?php
+
+class Functions
+{
+    public static function date_german_to_iso($date)
+    {
+       if (strlen($date) > 0) {
+           $datum = explode(".", $date);
+
+           if (count($datum) > 1) {
+               if (strlen($datum[1]) == 0) {
+                   $datum[1] = date("m");
+               }
+               if (strlen($datum[2]) == 0) {
+                   if ($datum[1] == '12' && date('m') == '1')
+                       $datum[2] = date("Y", time() - 60*60*24*(date('d')+1));
+                   else
+                       $datum[2] = date("Y");
+               } elseif (strlen($datum[2]) == 1) {
+                   $datum[2] = "200" . $datum[2];
+               } elseif (strlen($datum[2]) == 2) {
+                   $datum[2] = "20" . $datum[2];
+               }
+
+               $date = $datum[2] . "-" . $datum[1] . "-" . $datum[0];
+           }
+       } else {
+           $date = date("Y-m-j");
+       }
+       return $date;
+    }
+}
\ No newline at end of file

diff --git a/src/InfoCon/account/list.wml b/src/InfoCon/account/list.wml
index 3db6613..249199c 100644 (file)
--- a/src/InfoCon/account/list.wml
+++ b/src/InfoCon/account/list.wml
@@ -25,7 +25,6 @@ if (!empty($_POST['ajax']) && $_POST['ajax'] == 1) {
 
 <calendar_init -5>
 <account_heading>
-<form_to_yyyymmdd>
 
 <style type="text/css">
 div#filter_popup {

diff --git a/src/InfoCon/account/update.wml b/src/InfoCon/account/update.wml
index 35b8b05..e52af60 100644 (file)
--- a/src/InfoCon/account/update.wml
+++ b/src/InfoCon/account/update.wml
@@ -13,7 +13,6 @@
 <account_heading>
 
 <sql_prepare>
-<form_to_yyyymmdd>
 
 <?
   if ($_POST['formtype'] == "admin") {
@@ -78,7 +77,7 @@
     $descr = $db->quote(trim($_POST['descr']));
     $from_to = $db->quote($from_to);
 
-    $date = form_to_yyyymmdd ($_POST['datum']);
+    $date = Functions::date_german_to_iso($_POST['datum']);
 
     $value = str_replace (",",".", $_POST['value']);
 

diff --git a/src/LTOL/2000/costs/update.wml b/src/LTOL/2000/costs/update.wml
index 622f08a..954ca21 100644 (file)
--- a/src/LTOL/2000/costs/update.wml
+++ b/src/LTOL/2000/costs/update.wml
@@ -4,7 +4,6 @@
 <page func="Oldenburger LinuxTag 2000" title="Kostenverteilung">
 
 <sql_prepare>
-<form_to_yyyymmdd>
 
 <?
   $dbh = pg_pconnect ("<dbhost>", "<dbport>", "<dbname>")
@@ -13,7 +12,7 @@
   $category = sql_prepare ($category);
   $descr = sql_prepare ($descr);
 
-  $date = form_to_yyyymmdd ($datum);
+  $data = Functions::date_german_to_iso($datum);
 
   if ($oid > 0) {
     if (strlen ($delete)) {