Renamed to match with latest core. Database files ignored, cache files ignored

diff --git a/.gitattributes b/.gitattributes
index 5e68650dba21e889cdd393410bcadb4c2cf95938..d50f5b2ca2ad3fd3ac76090388e770bf6aa66b19 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -224,12 +224,13 @@ application/ship-simu/templates/de/emails/text_resend_link.tpl -text
 application/ship-simu/templates/de/html/.htaccess -text
 application/ship-simu/templates/de/html/nav_advert.tpl -text
 application/ship-simu/templates/de/html/selector_ship-simu.tpl -text
 application/ship-simu/templates/de/html/.htaccess -text
 application/ship-simu/templates/de/html/nav_advert.tpl -text
 application/ship-simu/templates/de/html/selector_ship-simu.tpl -text

+application/ship-simu/templates/de/menu/.htaccess -text

 application/ship-simu/templates/images/.htaccess -text
 application/ship-simu/templates/images/_cache/.htaccess -text
 application/ship-simu/templates/images/de/.htaccess -text
 application/ship-simu/templates/images/de/image/.htaccess -text
 application/ship-simu/templates/images/.htaccess -text
 application/ship-simu/templates/images/_cache/.htaccess -text
 application/ship-simu/templates/images/de/.htaccess -text
 application/ship-simu/templates/images/de/image/.htaccess -text

-application/ship-simu/templates/images/de/image/base_code.itp -text
-application/ship-simu/templates/images/de/image/code_captcha.itp -text
+application/ship-simu/templates/images/de/image/base_code.xml -text
+application/ship-simu/templates/images/de/image/code_captcha.xml -text

 /clear-cache.sh -text
 db/.htaccess -text
 db/company/.htaccess -text
 /clear-cache.sh -text
 db/.htaccess -text
 db/company/.htaccess -text

diff --git a/.gitignore b/.gitignore
index 5e4afd2d1a2425109d616696a58f967c0a29a4b7..9a129d4acb254049cd9d9f7a14cde29e49092bc5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,11 @@
 /.cache
 /.project
 /.settings
 /.cache
 /.project
 /.settings

+application/ship-simu/templates/images/_cache/*.*
+db/company/*.serialized
+db/company_user/*.serialized
+db/gov_user/*.serialized
+db/news/*.serialized
+db/payments/*.serialized
+db/user/*.serialized
+db/user_points/*.serialized

diff --git a/application/ship-simu/templates/de/menu/.htaccess b/application/ship-simu/templates/de/menu/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/menu/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/application/ship-simu/templates/images/de/image/base_code.itp b/application/ship-simu/templates/images/de/image/base_code.itp
deleted file mode 100644 (file)
index 6501b56..0000000
--- a/application/ship-simu/templates/images/de/image/base_code.itp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<image>
-       <type value="{?image_type?}" />
-       <base>
-               <name value="{?image_name?}" />
-       </base>
-       <resolution>
-               <width value="{?image_width?}" />
-               <height value="{?image_height?}" />
-       </resolution>
-       <background-color>
-               <red value="{?image_bg_red?}" />
-               <green value="{?image_bg_green?}" />
-               <blue value="{?image_bg_blue?}" />
-       </background-color>
-       <foreground-color>
-               <red value="{?image_fg_red?}" />
-               <green value="{?image_fg_green?}" />
-               <blue value="{?image_fg_blue?}" />
-       </foreground-color>
-       <image-string value="groupable">
-               <string-name value="{?image_string_name?}" />
-               <x value="{?image_x?}" />
-               <y value="{?image_y?}" />
-               <font-size value="{?image_size?}" />
-               <text value="{?image_string?}" />
-       </image-string>
-</image>

diff --git a/application/ship-simu/templates/images/de/image/base_code.xml b/application/ship-simu/templates/images/de/image/base_code.xml
new file mode 100644 (file)
index 0000000..6501b56
--- /dev/null
+++ b/application/ship-simu/templates/images/de/image/base_code.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<image>
+       <type value="{?image_type?}" />
+       <base>
+               <name value="{?image_name?}" />
+       </base>
+       <resolution>
+               <width value="{?image_width?}" />
+               <height value="{?image_height?}" />
+       </resolution>
+       <background-color>
+               <red value="{?image_bg_red?}" />
+               <green value="{?image_bg_green?}" />
+               <blue value="{?image_bg_blue?}" />
+       </background-color>
+       <foreground-color>
+               <red value="{?image_fg_red?}" />
+               <green value="{?image_fg_green?}" />
+               <blue value="{?image_fg_blue?}" />
+       </foreground-color>
+       <image-string value="groupable">
+               <string-name value="{?image_string_name?}" />
+               <x value="{?image_x?}" />
+               <y value="{?image_y?}" />
+               <font-size value="{?image_size?}" />
+               <text value="{?image_string?}" />
+       </image-string>
+</image>

diff --git a/application/ship-simu/templates/images/de/image/code_captcha.itp b/application/ship-simu/templates/images/de/image/code_captcha.itp
deleted file mode 100644 (file)
index 2e28522..0000000
--- a/application/ship-simu/templates/images/de/image/code_captcha.itp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-// Needed in every image template to initialy set the image type
-$helper = ImageHelper::createImageHelper($this, "png");
-$helper->setImageName("code_captcha");
-$helper->setBaseImage("base_code");
-
-// Set image dimensions
-$helper->setWidth(100);
-$helper->setHeight(50);
-
-// Get random number
-$rand = $helper->getRngInstance()->randomNumber(0, 6);
-
-// Background and foreground color
-switch ($rand) {
-       case 1:
-               // First varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x90  , 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xff  , 'rand');
-               break;
-
-       case 2:
-               // Second varriant
-               $helper->setBackgroundColorRedGreenBlue(0x90  , 'rand', 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-
-       case 3:
-               // Third varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xff  );
-               break;
-
-       case 4:
-               // Forth varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 0x90  , 'rand');
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xa0  );
-               break;
-
-       case 5:
-               // Fith varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xe0  , 'rand');
-               break;
-
-       default:
-               // Last varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 'rand', 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-}
-
-// Random X/Y factors...
-$xRand = $helper->getRngInstance()->randomNumber(0, 45);
-$yRand = $helper->getRngInstance()->randomNumber(0, 25);
-
-// Add code
-$helper->addTextLine("code");
-$helper->setCoord((5 + $xRand), (5 + $yRand));
-$helper->setFontSize('rand');
-$helper->setImageString("{?decrypted_code?}");
-
-// Only for debug!
-/*
-$helper->addTextLine("debug");
-$helper->setCoord(90, 35);
-$helper->setFontSize(3);
-$helper->setImageString($rand);
-*/
-
-// Flush content to the template engine
-$helper->flushContent();
-
-// Comment this out if image is done
-//$this->debugInstance();
-
-// [EOF]
-?>

diff --git a/application/ship-simu/templates/images/de/image/code_captcha.xml b/application/ship-simu/templates/images/de/image/code_captcha.xml
new file mode 100644 (file)
index 0000000..2e28522
--- /dev/null
+++ b/application/ship-simu/templates/images/de/image/code_captcha.xml
@@ -0,0 +1,78 @@
+<?php
+// Needed in every image template to initialy set the image type
+$helper = ImageHelper::createImageHelper($this, "png");
+$helper->setImageName("code_captcha");
+$helper->setBaseImage("base_code");
+
+// Set image dimensions
+$helper->setWidth(100);
+$helper->setHeight(50);
+
+// Get random number
+$rand = $helper->getRngInstance()->randomNumber(0, 6);
+
+// Background and foreground color
+switch ($rand) {
+       case 1:
+               // First varriant
+               $helper->setBackgroundColorRedGreenBlue('rand', 0x90  , 0x00  );
+               $helper->setForegroundColorRedGreenBlue(0x00  , 0xff  , 'rand');
+               break;
+
+       case 2:
+               // Second varriant
+               $helper->setBackgroundColorRedGreenBlue(0x90  , 'rand', 0x00  );
+               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
+               break;
+
+       case 3:
+               // Third varriant
+               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
+               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xff  );
+               break;
+
+       case 4:
+               // Forth varriant
+               $helper->setBackgroundColorRedGreenBlue(0x00  , 0x90  , 'rand');
+               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xa0  );
+               break;
+
+       case 5:
+               // Fith varriant
+               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
+               $helper->setForegroundColorRedGreenBlue(0x00  , 0xe0  , 'rand');
+               break;
+
+       default:
+               // Last varriant
+               $helper->setBackgroundColorRedGreenBlue(0x00  , 'rand', 0x90  );
+               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
+               break;
+}
+
+// Random X/Y factors...
+$xRand = $helper->getRngInstance()->randomNumber(0, 45);
+$yRand = $helper->getRngInstance()->randomNumber(0, 25);
+
+// Add code
+$helper->addTextLine("code");
+$helper->setCoord((5 + $xRand), (5 + $yRand));
+$helper->setFontSize('rand');
+$helper->setImageString("{?decrypted_code?}");
+
+// Only for debug!
+/*
+$helper->addTextLine("debug");
+$helper->setCoord(90, 35);
+$helper->setFontSize(3);
+$helper->setImageString($rand);
+*/
+
+// Flush content to the template engine
+$helper->flushContent();
+
+// Comment this out if image is done
+//$this->debugInstance();
+
+// [EOF]
+?>