Code style changed, ext-user continued:

[mailer.git] / inc / revision-functions.php

diff --git a/inc/revision-functions.php b/inc/revision-functions.php
index 318f337e260babbf78aad66dc1e06ab4bd07d691..e61d9788751d69dfd852a1cf351cab7a2d47c615 100644 (file)
--- a/inc/revision-functions.php
+++ b/inc/revision-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,16 +55,25 @@ function initRepositoryData () {
                // Default branch
                'Tag'      => 8
        );
+
+       // Add Revision, Date, Tag and Author
+       $GLOBALS['repository_search_for'] = array(
+               'File',
+               'Revision',
+               'Date',
+               'Tag',
+               'Author'
+       );
 }
 
 // "Getter" for revision/version data
 function getRepositoryData ($type = 'Revision') {
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret[' . $type . '] - ENTRY!');
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret[' . $type . '] - ENTERED!');
        // Default is an invalid value to find bugs... :-)
        $ret = 'INVALID';
 
        // By default nothing is new... ;-)
-       $new = false;
+       $new = FALSE;
 
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['revision'][$type][0])) {
@@ -81,24 +90,24 @@ function getRepositoryData ($type = 'Revision') {
                // Check if 'check_revision_data' is setted (switch for manually rewrite the .revision-File)
                if ((isGetRequestElementSet('check_revision_data')) && (getRequestElement('check_revision_data') == 'yes')) {
                        // Forced rebuild of .revision file
-                       $new = true;
+                       $new = TRUE;
                } else {
                        // Check for revision file
                        if (!isFileReadable($FQFN)) {
                                // Not found, so we need to create it
-                               $new = true;
+                               $new = TRUE;
                        } else {
                                // Revision file found
-                               $ins_vers = explode("\n", readFromFile($FQFN));
+                               $ins_vers = explode(chr(10), readFromFile($FQFN));
 
                                // Get array for mapping information
-                               $mapper = array_flip(getSearchFor());
-                               //* DEBUG: */ debugOutput('<pre>mapper='.print_r($mapper, true).'</pre>ins_vers=<pre>'.print_r($ins_vers, true).'</pre>');
+                               $mapper = array_flip($GLOBALS['repository_search_for']);
+                               //* DEBUG: */ debugOutput('<pre>mapper='.print_r($mapper, TRUE).'</pre>ins_vers=<pre>'.print_r($ins_vers, TRUE).'</pre>');
 
                                // Is the content valid?
                                if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == '') || ($ins_vers[0]) == 'new') {
                                        // File needs update!
-                                       $new = true;
+                                       $new = TRUE;
                                } else {
                                        // Generate fake cache entry
                                        foreach ($mapper as $map => $idx) {
@@ -113,9 +122,9 @@ function getRepositoryData ($type = 'Revision') {
                }
 
                // Has it been updated?
-               if ($new === true)  {
+               if ($new === TRUE)  {
                        // Write it
-                       writeToFile($FQFN, implode("\n", getArrayFromRepositoryData()));
+                       writeToFile($FQFN, implode(chr(10), getArrayFromRepositoryData()));
 
                        // ... and call recursive
                        $ret = getRepositoryData($type);
@@ -124,20 +133,10 @@ function getRepositoryData ($type = 'Revision') {
        }
 
        // Return the value
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret[' . $type . ']=' . $ret);
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret[' . $type . ']=' . $ret . ' - EXIT!');
        return $ret;
 }
 
-// Repares an array we are looking for
-// The returned Array is needed twice (in getArrayFromRepositoryData() and in getRepositoryData() in the old .revision-fallback) so I puted it in an extra function to not polute the global namespace
-function getSearchFor () {
-       // Add Revision, Date, Tag and Author
-       $searchFor = array('File', 'Revision', 'Date', 'Tag', 'Author');
-
-       // Return the created array
-       return $searchFor;
-}
-
 // Extracts requested revision info from given file data
 function extractRevisionInfoFromData ($fileData, $search) {
        // Default is to return empty string
@@ -196,7 +195,7 @@ function getArrayFromRepositoryData () {
        $GLOBALS['cache_array']['revision']['File'][0] = $last_changed['path_name'];
 
        // This foreach loops the $searchFor-Tags (array('Revision', 'Date', 'Tag', 'Author') --> could easaly extended in the future)
-       foreach (getSearchFor() as $search) {
+       foreach ($GLOBALS['repository_search_for'] as $search) {
                // This extracts the requested data $search from file data $last_file
                if ($search != 'File') {
                        // Skip 'File' because we have set it some lines above
@@ -228,12 +227,12 @@ function getArrayFromRepositoryData () {
                // Invalid request reply?
                if (!isset($version[11])) {
                        // Cannot continue here
-                       debug_report_bug(__FUNCTION__, __LINE__, 'Invalid response from check-updates3.php, count should be at least 11, is ' . count($version));
+                       reportBug(__FUNCTION__, __LINE__, 'Invalid response from check-updates3.php, count should be at least 11, is ' . count($version));
                } // END - if
 
                // Prepare content
                // Only sets not setted or not proper values to the Online-Server-Fallback-Solution
-               foreach (getSearchFor() as $entry) {
+               foreach ($GLOBALS['repository_search_for'] as $entry) {
                        // Is it not set or empty?
                        if ((!isset($GLOBALS['cache_array']['revision'][$entry][0])) || (empty($GLOBALS['cache_array']['revision']['File'][0]))) {
                                // Is default data entry nummerical?