Changeset 150 for trunk/Phergie/Plugin/Set.php

Timestamp:

03/09/08 16:02:40 (5 years ago)

Author:

Seldaek

Message:

* Set: Fix for ini files containing weird CR/LF sequences

Files:

• trunk/Phergie/Plugin/Set.php (modified) (4 diffs)

trunk/Phergie/Plugin/Set.php

@@ -16 +16 @@
     public function onDoSet($var, $value, $tmp = null)
     {
-          if ($this->fromAdmin(false)) {
+        if ($this->fromAdmin(false)) {
             $append = $var === '-a' || $var === 'append';
             // Got an append parameter, so we shift value/tmp down to var/value
@@ -26 +26 @@
             }
 
-            // Get ini file
-            $ini = PHERGIE_DIR . 'Phergie/' . (empty($_SERVER['argv'][1]) ? PHERGIE_INI : $_SERVER['argv'][1]);
-            $contents = file_get_contents($ini);
-            // Replace var/value
-            if (preg_match('#^\s*('.str_replace('.', '\\.', $var).'\s*=\s*)(.*)$#im', $contents, $m)) {
-                $contents = preg_replace('#^\s*'.str_replace('.', '\\.', $var).'\s*=.*$#im', $var.' = '.$this->makeIniValue($value, $m[2], $append), $contents);
-                $this->setIni($var, $this->parseIniValue($this->makeIniValue($value, $m[2], $append)));
-            // Insert it if not set
-            } else {
-                $contents .= "\r\n".$var.' = '.$this->makeIniValue($value);
-                $this->setIni($var, $this->parseIniValue($value));
-            }
-
-            // Save ini file
-            file_put_contents($ini, $contents);
+                // Get ini file
+                $ini = PHERGIE_DIR . 'Phergie/' . (empty($_SERVER['argv'][1]) ? PHERGIE_INI : $_SERVER['argv'][1]);
+                $contents = preg_replace("#\r\n|\r|\n#", "\r\n", file_get_contents($ini));
+                // Replace var/value
+                if (preg_match('#^('.str_replace('.', '\\.', $var).'\s*= *)(.*)$#im', $contents, $m)) {
+                        $contents = preg_replace('#^'.str_replace('.', '\\.', $var).'\s*=.*$#im', $var.' = '.str_replace('$', '\\$', $this->makeIniValue($value, $m[2], $append)), $contents);
+                        $this->setIni($var, $this->parseIniValue($this->makeIniValue($value, $m[2], $append)));
+                        // Insert it if not set
+                } else {
+                        $contents .= "\r\n".$var.' = '.$this->makeIniValue($value);
+                        $this->setIni($var, $this->parseIniValue($value));
+                }
+                // Save ini file
+                file_put_contents($ini, $contents);
         }
     }
 
+        /**
+         * Returns a ini setting
+         */
         public function onDoGet($var)
         {
-      if ($this->fromAdmin(false)) {
-                      $val = $this->getIni($var);
-                      $this->doPrivmsg($this->event->getSource(), $var.' = '.($val===null?'null':$val));
-                  }
+                if ($this->fromAdmin(false)) {
+                        $this->doPrivmsg($this->event->getSource(), $var.' = '.$this->getIni($var));
+                }
         }
 
@@ -57 +58 @@
     protected function makeIniValue($new, $old = "", $append = false)
     {
-        $new = trim($new, '" ');
-        $old = trim($old, '" ');
+        $new = trim($new, "\" '");
+        $old = trim($old, "\" \n\r");
                 if ($append && !empty($old)) {
                         return '"'.$old.', '.$new.'"';
@@ -77 +78 @@
     }
 
+        /**
+         * Reads a ini value similarly to parse_ini_file()
+         */
     protected function parseIniValue($value)
     {