Changeset 2255 for branches

Timestamp:

11/26/10 15:58:08 (18 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Various too small edits out of me being a p**ck.

Location:

branches/1.5/libs

Files:

• Debug.php (modified) (2 diffs)
• Language.php (modified) (15 diffs)
• PluginFunctions.php (modified) (2 diffs)
• SystemInfo.php (modified) (10 diffs)

branches/1.5/libs/Debug.php

@@ -74 +74 @@
                         unlink($filename);
                 }
-                
+
                 if(!file_exists($filename))
                 {
@@ -132 +132 @@
 
 }
-
-?>

branches/1.5/libs/Language.php

@@ -5 +5 @@
  * PHP version 5
  *
- * LICENSE: Hotaru CMS is free software: you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation, either version 3 of 
- * the License, or (at your option) any later version. 
- *
- * Hotaru CMS is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE. 
- *
- * You should have received a copy of the GNU General Public License along 
+ * LICENSE: Hotaru CMS is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * Hotaru CMS is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU General Public License along
  * with Hotaru CMS. If not, see http://www.gnu.org/licenses/.
- * 
+ *
  * @category  Content Management System
  * @package   HotaruCMS
@@ -39 +39 @@
 
                 if( file_exists($file) ) {
-                
+
                         if( isset($lang['files'][$file]) && ($lang['files'][$file] == true) ) {
                                 return $lang; // return what we've got. No need to reinclude the language
@@ -60 +60 @@
                 return $lang_array;
         }
-        
-        
+
+
         /**
          * Include a language file in a plugin
@@ -70 +70 @@
          * Note: the language file should be in a plugin folder named 'languages'.
          * '_language.php' is appended automatically to the folder of file name.
-         */    
+         */
         public function includeLanguage($h, $folder = '', $filename = '')
         {
@@ -105 +105 @@
                 }
         }
-        
-        
+
+
         /**
          * Include a language file for a theme
@@ -114 +114 @@
          * Note: the language file should be in a plugin folder named 'languages'.
          * '_language.php' is appended automatically to the folder of file name.
-         */    
+         */
         public function includeThemeLanguage($h, $filename = 'main')
         {
@@ -141 +141 @@
                 }
         }
-        
-        
+
+
         /**
          * Include admin_language.php
@@ -148 +148 @@
          * Hotaru has already got the base admin_language.php file from /content, but
          * all or parts of it can be overidden.
-         * 
+         *
          * First Hotaru looks for admin_languages.php in the admin theme's "languages" folder
          * Second, it looks for admin_languages.php in the user theme's "languages" folder.
          * All files are merged with priority in this order: user theme, admin theme, content/admin_language.php
-         */    
+         */
         public function includeAdminLanguage($h)
         {
                 // 1. We already have admin_language.php from content/admin_language.php
-                
+
                 // 2. Merge in anything from admin_language.php in admin theme languages folder
-                
+
                 $file = ADMIN_THEMES . ADMIN_THEME . 'languages/admin_language.php';
                 // check if this language is already cached
@@ -166 +166 @@
                         }
                 }
-                
+
                 // 2. Merge in anything from admin_language.php in user theme languages folder
-                
+
                 $file = THEMES . THEME . 'languages/admin_language.php';
                 if (!$this->checkLanguageCached($h, $file)) {
@@ -176 +176 @@
                 }
         }
-        
-        
+
+
         /**
          * Use or create a language cache file
@@ -187 +187 @@
         {
                 if (LANG_CACHE != 'true') { return false; }
-                
+
                 $cache_length = $timeout*60;   // seconds
                 $cache = CACHE . 'lang_cache/';
                 $file = $cache . "language.php";
-                
+
                 if (file_exists($file)) {
                         $last_modified = filemtime($file);
-                        if ($last_modified <= (time() - $cache_length)) { 
+                        if ($last_modified <= (time() - $cache_length)) {
                                 // delete cache
                                 @unlink($file);
@@ -205 +205 @@
                         }
                 }
-                
+
                 return false;
         }
-        
-        
+
+
         /**
          * Add to list of included language files
@@ -220 +220 @@
                 return isset($h->lang['files'][$file]);
         }
-        
-        
+
+
         /**
          * Add to list of included language files
@@ -249 +249 @@
 
                 $h->vars['update_lang_cache'] = TRUE;
-                
+
                 return TRUE; // added
         }
-        
-        
+
+
         /**
          * Write language cache
@@ -273 +273 @@
                 $cache = CACHE.'lang_cache/';
                 $file = $cache."language.php";
+                // write the file
                 $fh = fopen($file, 'w+') or die("Sorry, I can't open ".$file);
                 if( flock($fh, LOCK_EX) ) { // do an exclusive lock

branches/1.5/libs/PluginFunctions.php

@@ -34 +34 @@
          * @return array | bool
          */
-        public function pluginHook($h, $hook, $folder = '', $parameters = array(), $exclude = array())
+        public function pluginHook($h, $hook = '', $folder = '', $parameters = array(), $exclude = array())
         {
 
@@ -244 +244 @@
                         $this->getAllPluginDetails($h);
                 }
-                
+
                 // no plugin details for this plugin found anywhere
                 if (!$h->allPluginDetails) {

branches/1.5/libs/SystemInfo.php

@@ -30 +30 @@
          * Calls external site to provide system info feedback report
          *
-         * @return bool true
+         * @return bool
          */
         public function hotaru_feedback($h, $format = 'json')
@@ -44 +44 @@
         }
 
-
         /**
          * Perform a POST request to a page.
@@ -57 +56 @@
                 // Generate the POST string
                 $ret = array();
-                foreach($query_vals as $key => $value) {
-                    $ret[] = $key.'='.urlencode($value);
+                foreach ($query_vals as $key => $value) {
+                        $ret[] = $key.'='.urlencode($value);
                 }
 
@@ -68 +67 @@
                 ));
                 $response = curl_exec($ch);
-                curl_close ($ch);
+                curl_close($ch);
 
                 return json_decode($response, true);
         }
-
 
         /**
@@ -222 +220 @@
                                 $tmp[] = $k.":".$v;
                         }
-                        $output[] = sprintf('%-30s'.chr(9).'(%s)', $key, implode(', ', $tmp)) ;
+                        $output[] = sprintf('%-30s'.chr(9).'(%s)', $key, implode(', ', $tmp));
                 }
                 $output[] = '';
@@ -240 +238 @@
                         foreach ($report['hotaru_plugins'] as $key => $value) {
                                 $version = 'v. '.$value['version'];
-                                $output[] = sprintf("%2d. [%s] %-20s %s", $value['order'], (($value['enabled'])?'+':'-'), $key, $version );
+                                $output[] = sprintf("%2d. [%s] %-20s %s", $value['order'], (($value['enabled']) ? '+' : '-'), $key, $version);
                         }
                 }
@@ -262 +260 @@
                                         $output[] = 'Plugin settings for '.$key.':';
                                         $output[] = chr(9).$k.' = ';
-                                        $output[] = $this->outputArrays( $v,chr(9) );
+                                        $output[] = $this->outputArrays($v, chr(9));
                                 }
                         }
@@ -295 +293 @@
 
                 $output[] = '-End of Report-';
-                
+
                 return implode("\n", $output);
         }
-
 
         /**
@@ -308 +305 @@
         public function outputArrays($array, $tab='')
         {
-                $tab = (empty($tab))?chr(9): $tab.chr(9);
+                $tab = (empty($tab)) ? chr(9) : $tab.chr(9);
                 $output = $array;
                 if (is_array($array) || is_object($array)) {
@@ -326 +323 @@
         }
 
-        /* These can be removed after the Cron plugin is updated to no longer use them */
+        // These can be removed after the Cron plugin is updated to no longer use them
         public function hotaru_version() { return false; }
         public function plugin_version_getAll() { return false; }
+
 }
-?>