Slight simplification of Zend_Service_LiveDocx_* demonstration applications.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19448 44c647ce-9c0f-0410-b52a-842ac1e357ba

demos/Zend/Service/LiveDocx/Helper.php

@@ -34,12 +34,20 @@ require_once 'Zend/Date.php';
 class Demos_Zend_Service_LiveDocx_Helper
 {
     /**
-     * LiveDocx demo username
+     * LiveDocx demonstration username
+     * 
+     * IMPORTANT: These login credentials may be used for demonstration purposes only.
+     *            Getting your own username and password takes less than 1 minute.
+     *            Goto http://is.gd/5dK5A to sign up.
      */
     const USERNAME = 'zfdemos';
     
     /**
-     * LiveDocx demo password
+     * LiveDocx demonstration password
+     *
+     * IMPORTANT: These login credentials may be used for demonstration purposes only.
+     *            Getting your own username and password takes less than 1 minute.
+     *            Goto http://is.gd/5dK5A to sign up.
      */    
     const PASSWORD = 'fkj3487o4zf35';
     
@@ -63,17 +71,14 @@ class Demos_Zend_Service_LiveDocx_Helper
     {
         $ret = '';
         
-        $dateFormat = Zend_Date::RFC_1123;
-        
         $date = new Zend_Date();
-        $date->setLocale(self::LOCALE);
         
         if (count($result) > 0) {
             foreach ($result as $record) {
                 $date->set($record['createTime']);
-                $createTimeFormatted = $date->get($dateFormat);
+                $createTimeFormatted = $date->get(Zend_Date::RFC_1123);
                 $date->set($record['modifyTime']);
-                $modifyTimeFormatted = $date->get($dateFormat);
+                $modifyTimeFormatted = $date->get(Zend_Date::RFC_1123);
                 $ret .= sprintf('         Filename  : %s%s', $record['filename'], PHP_EOL);
                 $ret .= sprintf('         File Size : %d b%s', $record['fileSize'], PHP_EOL);
                 $ret .= sprintf('     Creation Time : %d (%s)%s', $record['createTime'], $createTimeFormatted, PHP_EOL);
@@ -81,6 +86,7 @@ class Demos_Zend_Service_LiveDocx_Helper
                 $ret .= PHP_EOL;
             }
         }
+        
         unset($date);
         
         return $ret;

demos/Zend/Service/LiveDocx/MailMerge/bitmaps/generate-bitmaps.php

@@ -4,10 +4,6 @@
 require_once dirname(__FILE__) . '/../../common.php';
 
 
-$date = new Zend_Date();
-
-$date->setLocale(Demos_Zend_Service_LiveDocx_Helper::LOCALE);
-
 $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
 
 $phpLiveDocx->setUsername(Demos_Zend_Service_LiveDocx_Helper::USERNAME)
@@ -18,8 +14,8 @@ $phpLiveDocx->setLocalTemplate('template.docx');
 $phpLiveDocx->assign('software', 'Magic Graphical Compression Suite v1.9')
             ->assign('licensee', 'Daï Lemaitre')
             ->assign('company',  'Megasoft Co-operation')
-            ->assign('date',     $date->get(Zend_Date::DATE_LONG))
-            ->assign('time',     $date->get(Zend_Date::TIME_LONG))
+            ->assign('date',     Zend_Date::now()->toString(Zend_Date::DATE_LONG))
+            ->assign('time',     Zend_Date::now()->toString(Zend_Date::TIME_LONG))
             ->assign('city',     'Lyon')
             ->assign('country',  'France');
 

demos/Zend/Service/LiveDocx/MailMerge/license-agreement/generate-document-concat.php

@@ -90,9 +90,6 @@ mkdir($tempDirectory);
 
 $tempFilenames = array();
 
-$date = new Zend_Date();
-$date->setLocale(Demos_Zend_Service_LiveDocx_Helper::LOCALE);
-
 $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
 
 $phpLiveDocx->setUsername(Demos_Zend_Service_LiveDocx_Helper::USERNAME)
@@ -108,8 +105,8 @@ for ($iteration = 1; $iteration <= $iterations; $iteration ++) {
     $phpLiveDocx->assign('software', randomString())
                 ->assign('licensee', randomString())
                 ->assign('company',  randomString())
-                ->assign('date',     $date->now()->get(Zend_Date::DATE_LONG))
-                ->assign('time',     $date->now()->get(Zend_Date::TIME_LONG))
+                ->assign('date',     Zend_Date::now()->toString(Zend_Date::DATE_LONG))
+                ->assign('time',     Zend_Date::now()->toString(Zend_Date::TIME_LONG))
                 ->assign('city',     randomString())
                 ->assign('country',  randomString());
         
@@ -120,7 +117,7 @@ for ($iteration = 1; $iteration <= $iterations; $iteration ++) {
     $logger->log(sprintf('Generating temporary document %s.', $tempFilename), Zend_Log::INFO);
 }
 
-unset($phpLiveDocx, $date);
+unset($phpLiveDocx);
 
 // -----------------------------------------------------------------------------
 

demos/Zend/Service/LiveDocx/MailMerge/license-agreement/generate-document.php

@@ -4,10 +4,6 @@
 require_once dirname(__FILE__) . '/../../common.php';
 
 
-$date = new Zend_Date();
-
-$date->setLocale(Demos_Zend_Service_LiveDocx_Helper::LOCALE);
-
 $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
 
 $phpLiveDocx->setUsername(Demos_Zend_Service_LiveDocx_Helper::USERNAME)
@@ -18,8 +14,8 @@ $phpLiveDocx->setLocalTemplate('template.docx');
 $phpLiveDocx->assign('software', 'Magic Graphical Compression Suite v1.9')
             ->assign('licensee', 'Henry Döner-Meyer')
             ->assign('company',  'Co-Operation')
-            ->assign('date',     $date->get(Zend_Date::DATE_LONG))
-            ->assign('time',     $date->get(Zend_Date::TIME_LONG))
+            ->assign('date',     Zend_Date::now()->toString(Zend_Date::DATE_LONG))
+            ->assign('time',     Zend_Date::now()->toString(Zend_Date::TIME_LONG))
             ->assign('city',     'Berlin')
             ->assign('country',  'Germany');
 
@@ -42,8 +38,8 @@ $fieldValues = array (
         'software' => 'Magic Graphical Compression Suite v2.5',
         'licensee' => 'Henry Döner-Meyer',
         'company'  => 'Megasoft Co-Operation',
-        'date'     => $date->get(Zend_Date::DATE_LONG),
-        'time'     => $date->get(Zend_Date::DATE_LONG),
+        'date'     => Zend_Date::now()->toString(Zend_Date::DATE_LONG),
+        'time'     => Zend_Date::now()->toString(Zend_Date::TIME_LONG),
         'city'     => 'Berlin',
         'country'  => 'Germany'
     ),
@@ -52,15 +48,14 @@ $fieldValues = array (
         'software' => 'Magic CAD Suite v1.9',
         'licensee' => 'Brüno Döner-Meyer',
         'company'  => 'Future Co-Operation',
-        'date'     => $date->get(Zend_Date::DATE_LONG),
-        'time'     => $date->get(Zend_Date::DATE_LONG),
+        'date'     => Zend_Date::now()->toString(Zend_Date::DATE_LONG),
+        'time'     => Zend_Date::now()->toString(Zend_Date::TIME_LONG),
         'city'     => 'Berlin',
         'country'  => 'Germany'
     )    
 );
 
 $phpLiveDocx->assign($fieldValues);
-
 */
 
 $documentProperties = array (

demos/Zend/Service/LiveDocx/MailMerge/metafiles/generate-metafiles.php

@@ -4,10 +4,6 @@
 require_once dirname(__FILE__) . '/../../common.php';
 
 
-$date = new Zend_Date();
-
-$date->setLocale(Demos_Zend_Service_LiveDocx_Helper::LOCALE);
-
 $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
 
 $phpLiveDocx->setUsername(Demos_Zend_Service_LiveDocx_Helper::USERNAME)
@@ -18,8 +14,8 @@ $phpLiveDocx->setLocalTemplate('template.docx');
 $phpLiveDocx->setFieldValue('software', 'Magic Graphical Compression Suite v1.9')
             ->setFieldValue('licensee', 'Henry Döner-Meyer')
             ->setFieldValue('company',  'Megasoft Co-operation')
-            ->setFieldValue('date',     $date->get(Zend_Date::DATE_LONG))
-            ->setFieldValue('time',     $date->get(Zend_Date::TIME_LONG))
+            ->setFieldValue('date',     Zend_Date::now()->toString(Zend_Date::DATE_LONG))
+            ->setFieldValue('time',     Zend_Date::now()->toString(Zend_Date::TIME_LONG))
             ->setFieldValue('city',     'Bremen')
             ->setFieldValue('country',  'Germany');
 

demos/Zend/Service/LiveDocx/MailMerge/telephone-bill/generate-document.php

@@ -4,10 +4,6 @@
 require_once dirname(__FILE__) . '/../../common.php';
 
 
-$date = new Zend_Date();
-
-$date->setLocale(Demos_Zend_Service_LiveDocx_Helper::LOCALE);
-
 $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
 
 $phpLiveDocx->setUsername(Demos_Zend_Service_LiveDocx_Helper::USERNAME)
@@ -36,11 +32,12 @@ $phpLiveDocx->assign('customer_number', sprintf("#%'10s",  rand(0,1000000000)))
 
 $billData = array (  
     'phone'         => '+22 (0)333 444 555',
-    'date'          => $date->get(Zend_Date::DATE_LONG),
+    'date'          => Zend_Date::now()->toString(Zend_Date::DATE_LONG),
     'name'          => 'James Henry Brown',
     'service_phone' => '+22 (0)333 444 559',
     'service_fax'   => '+22 (0)333 444 558',
-    'month'         => sprintf('%s %s', $date->get(Zend_Date::MONTH_NAME), $date->get(Zend_Date::YEAR)),
+    'month'         => sprintf('%s %s', Zend_Date::now()->toString(Zend_Date::MONTH_NAME),
+                                        Zend_Date::now()->toString(Zend_Date::YEAR)),
     'monthly_fee'   =>  '15.00',
     'total_net'     =>  '19.60',
     'tax'           =>  '19.00',

demos/Zend/Service/LiveDocx/common.php

@@ -11,4 +11,9 @@ require_once dirname(__FILE__) . '/Helper.php';
 
 // Set autoloader to autoload libraries
 require_once 'Zend/Loader/Autoloader.php';
-$autoloader = Zend_Loader_Autoloader::getInstance();
+$autoloader = Zend_Loader_Autoloader::getInstance();
+
+// Set default locale
+Zend_Locale::setDefault(Demos_Zend_Service_LiveDocx_Helper::LOCALE);
+$locale = new Zend_Locale(Zend_Locale::ZFDEFAULT);
+Zend_Registry::set('Zend_Locale', $locale);