PetLid / rssreader

vendor/ezyang/htmlpurifier/package.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     array(
         'baseinstalldir' => '/',
         'packagefile' => 'package.xml',
-        'packagedirectory' => realpath(dirname(__FILE__) . '/library'),
+        'packagedirectory' => realpath(dirname(__FILE__).'/library'),
         'filelistgenerator' => 'file',
         'include' => array('*'),
         'dir_roles' => array('/' => 'php'), // hack to put *.ser files in the right place

vendor/ezyang/htmlpurifier/release1-update.php

Indentation +15 added lines, -15 removed lines

@@ -25,21 +25,21 @@
 
 // ...in NEWS
 if ($is_dev = (strpos($version, 'dev') === false)) {
-  $date = date('Y-m-d');
-  $news_c = str_replace(
-      $l = "$version, unknown release date",
-      "$version, released $date",
-      file_get_contents('NEWS'),
-      $c
-  );
-  if (!$c) {
-      echo 'Could not update NEWS, missing ' . $l . PHP_EOL;
-      exit;
-  } elseif ($c > 1) {
-      echo 'More than one release declaration in NEWS replaced' . PHP_EOL;
-      exit;
-  }
-  file_put_contents('NEWS', $news_c);
+    $date = date('Y-m-d');
+    $news_c = str_replace(
+        $l = "$version, unknown release date",
+        "$version, released $date",
+        file_get_contents('NEWS'),
+        $c
+    );
+    if (!$c) {
+        echo 'Could not update NEWS, missing ' . $l . PHP_EOL;
+        exit;
+    } elseif ($c > 1) {
+        echo 'More than one release declaration in NEWS replaced' . PHP_EOL;
+        exit;
+    }
+    file_put_contents('NEWS', $news_c);
 }
 
 // ...in Doxyfile

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
     exit;
 }
 
-if (!isset($argv[1])) {
+if (!isset($argv[ 1 ])) {
     echo
 'php release.php [version]
     HTML Purifier release script
@@ -16,7 +16,7 @@ 
     exit;
 }
 
-$version = trim($argv[1]);
+$version = trim($argv[ 1 ]);
 
 // Bump version numbers:
 
@@ -33,10 +33,10 @@ 
       $c
   );
   if (!$c) {
-      echo 'Could not update NEWS, missing ' . $l . PHP_EOL;
+      echo 'Could not update NEWS, missing '.$l.PHP_EOL;
       exit;
   } elseif ($c > 1) {
-      echo 'More than one release declaration in NEWS replaced' . PHP_EOL;
+      echo 'More than one release declaration in NEWS replaced'.PHP_EOL;
       exit;
   }
   file_put_contents('NEWS', $news_c);
@@ -50,7 +50,7 @@ 
     1, $c
 );
 if (!$c) {
-    echo 'Could not update Doxyfile, missing PROJECT_NUMBER.' . PHP_EOL;
+    echo 'Could not update Doxyfile, missing PROJECT_NUMBER.'.PHP_EOL;
     exit;
 }
 file_put_contents('Doxyfile', $doxyfile_c);
@@ -64,7 +64,7 @@ 
     1, $c
 );
 if (!$c) {
-    echo 'Could not update HTMLPurifier.php, missing HTML Purifier [version] header.' . PHP_EOL;
+    echo 'Could not update HTMLPurifier.php, missing HTML Purifier [version] header.'.PHP_EOL;
     exit;
 }
 $htmlpurifier_c = preg_replace(
@@ -74,7 +74,7 @@ 
     1, $c
 );
 if (!$c) {
-    echo 'Could not update HTMLPurifier.php, missing public $version.' . PHP_EOL;
+    echo 'Could not update HTMLPurifier.php, missing public $version.'.PHP_EOL;
     exit;
 }
 $htmlpurifier_c = preg_replace(
@@ -84,7 +84,7 @@ 
     1, $c
 );
 if (!$c) {
-    echo 'Could not update HTMLPurifier.php, missing const $version.' . PHP_EOL;
+    echo 'Could not update HTMLPurifier.php, missing const $version.'.PHP_EOL;
     exit;
 }
 file_put_contents('library/HTMLPurifier.php', $htmlpurifier_c);
@@ -97,14 +97,14 @@ 
     1, $c
 );
 if (!$c) {
-    echo 'Could not update Config.php, missing public $version.' . PHP_EOL;
+    echo 'Could not update Config.php, missing public $version.'.PHP_EOL;
     exit;
 }
 file_put_contents('library/HTMLPurifier/Config.php', $config_c);
 
 passthru('php maintenance/flush.php');
 
-if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL;
+if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'".PHP_EOL;
 else echo "Numbers updated to dev, no other modifications necessary!";
 
 // vim: et sw=4 sts=4

Braces +5 added lines, -2 removed lines

@@ -104,7 +104,10 @@
 
 passthru('php maintenance/flush.php');
 
-if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL;
-else echo "Numbers updated to dev, no other modifications necessary!";
+if ($is_dev) {
+    echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL;
+} else {
+    echo "Numbers updated to dev, no other modifications necessary!";
+}
 
 // vim: et sw=4 sts=4

vendor/ezyang/htmlpurifier/plugins/phorum/migrate.bbcode.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
  * explicitly says, "No, I do not need to migrate."
  */
 
-if(!defined("PHORUM")) exit;
+if (!defined("PHORUM")) exit;
 
-require_once(dirname(__FILE__) . "/../bbcode/bbcode.php");
+require_once(dirname(__FILE__)."/../bbcode/bbcode.php");
 
 /**
  * 'format' hook style function that will be called to convert

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
  * explicitly says, "No, I do not need to migrate."
  */
 
-if(!defined("PHORUM")) exit;
+if(!defined("PHORUM")) {
+    exit;
+}
 
 require_once(dirname(__FILE__) . "/../bbcode/bbcode.php");
 

vendor/ezyang/htmlpurifier/plugins/phorum/init-config.php

Spacing +6 added lines, -6 removed lines

@@ -9,22 +9,22 @@
 {
     global $PHORUM;
     $config_exists = phorum_htmlpurifier_config_file_exists();
-    if ($default || $config_exists || !isset($PHORUM['mod_htmlpurifier']['config'])) {
+    if ($default || $config_exists || !isset($PHORUM[ 'mod_htmlpurifier' ][ 'config' ])) {
         $config = HTMLPurifier_Config::createDefault();
-        include(dirname(__FILE__) . '/config.default.php');
+        include(dirname(__FILE__).'/config.default.php');
         if ($config_exists) {
-            include(dirname(__FILE__) . '/config.php');
+            include(dirname(__FILE__).'/config.php');
         }
-        unset($PHORUM['mod_htmlpurifier']['config']); // unnecessary
+        unset($PHORUM[ 'mod_htmlpurifier' ][ 'config' ]); // unnecessary
     } else {
-        $config = HTMLPurifier_Config::create($PHORUM['mod_htmlpurifier']['config']);
+        $config = HTMLPurifier_Config::create($PHORUM[ 'mod_htmlpurifier' ][ 'config' ]);
     }
     return $config;
 }
 
 function phorum_htmlpurifier_config_file_exists()
 {
-    return file_exists(dirname(__FILE__) . '/config.php');
+    return file_exists(dirname(__FILE__).'/config.php');
 }
 
 // vim: et sw=4 sts=4

vendor/ezyang/htmlpurifier/plugins/phorum/htmlpurifier.php

Indentation +5 added lines, -5 removed lines

@@ -131,10 +131,10 @@ 
     $phorum_sig = '';
     if(isset($row["user"]["signature"])
        && isset($row['meta']['show_signature']) && $row['meta']['show_signature']==1){
-           $phorum_sig=trim($row["user"]["signature"]);
-           if(!empty($phorum_sig)){
-               $phorum_sig="\n\n$phorum_sig";
-           }
+            $phorum_sig=trim($row["user"]["signature"]);
+            if(!empty($phorum_sig)){
+                $phorum_sig="\n\n$phorum_sig";
+            }
     }
     return $phorum_sig;
 }
@@ -261,7 +261,7 @@ 
     if (!empty($GLOBALS['PHORUM']['mod_htmlpurifier']['wysiwyg'])) {
         $i = $GLOBALS['PHORUM']['DATA']['MODE'];
         if ($i == 'quote' || $i == 'edit' || $i == 'moderation') {
-          ?>
+            ?>
           <div>
             <p>
               <strong>Notice:</strong> HTML has been scrubbed for your safety.

Spacing +61 added lines, -61 removed lines

@@ -30,37 +30,37 @@ 
  */
 function phorum_htmlpurifier_format($data)
 {
-    $PHORUM = $GLOBALS["PHORUM"];
+    $PHORUM = $GLOBALS[ "PHORUM" ];
 
-    $purifier =& HTMLPurifier::getInstance();
-    $cache_serial = $PHORUM['mod_htmlpurifier']['body_cache_serial'];
+    $purifier = & HTMLPurifier::getInstance();
+    $cache_serial = $PHORUM[ 'mod_htmlpurifier' ][ 'body_cache_serial' ];
 
-    foreach($data as $message_id => $message){
-        if(isset($message['body'])) {
+    foreach ($data as $message_id => $message) {
+        if (isset($message[ 'body' ])) {
 
             if ($message_id) {
                 // we're dealing with a real message, not a fake, so
                 // there a number of shortcuts that can be taken
 
-                if (isset($message['meta']['htmlpurifier_light'])) {
+                if (isset($message[ 'meta' ][ 'htmlpurifier_light' ])) {
                     // format hook was called outside of Phorum's normal
                     // functions, do the abridged purification
-                    $data[$message_id]['body'] = $purifier->purify($message['body']);
+                    $data[ $message_id ][ 'body' ] = $purifier->purify($message[ 'body' ]);
                     continue;
                 }
 
-                if (!empty($PHORUM['args']['purge'])) {
+                if (!empty($PHORUM[ 'args' ][ 'purge' ])) {
                     // purge the cache, must be below the following if
-                    unset($message['meta']['body_cache']);
+                    unset($message[ 'meta' ][ 'body_cache' ]);
                 }
 
                 if (
-                    isset($message['meta']['body_cache']) &&
-                    isset($message['meta']['body_cache_serial']) &&
-                    $message['meta']['body_cache_serial'] == $cache_serial
+                    isset($message[ 'meta' ][ 'body_cache' ]) &&
+                    isset($message[ 'meta' ][ 'body_cache_serial' ]) &&
+                    $message[ 'meta' ][ 'body_cache_serial' ] == $cache_serial
                 ) {
                     // cached version is present, bail out early
-                    $data[$message_id]['body'] = base64_decode($message['meta']['body_cache']);
+                    $data[ $message_id ][ 'body' ] = base64_decode($message[ 'meta' ][ 'body_cache' ]);
                     continue;
                 }
             }
@@ -72,26 +72,26 @@ 
             // create the $body variable
             if (
                 $message_id && // message must be real to migrate
-                !isset($message['meta']['body_cache_serial'])
+                !isset($message[ 'meta' ][ 'body_cache_serial' ])
             ) {
                 // perform migration
                 $fake_data = array();
                 list($signature, $edit_message) = phorum_htmlpurifier_remove_sig_and_editmessage($message);
-                $fake_data[$message_id] = $message;
+                $fake_data[ $message_id ] = $message;
                 $fake_data = phorum_htmlpurifier_migrate($fake_data);
-                $body = $fake_data[$message_id]['body'];
+                $body = $fake_data[ $message_id ][ 'body' ];
                 $body = str_replace("<phorum break>\n", "\n", $body);
-                $updated_message['body'] = $body; // save it in
-                $body .= $signature . $edit_message; // add it back in
+                $updated_message[ 'body' ] = $body; // save it in
+                $body .= $signature.$edit_message; // add it back in
             } else {
                 // reverse Phorum's pre-processing
-                $body = $message['body'];
+                $body = $message[ 'body' ];
                 // order is important
                 $body = str_replace("<phorum break>\n", "\n", $body);
-                $body = str_replace(array('&lt;','&gt;','&amp;', '&quot;'), array('<','>','&','"'), $body);
+                $body = str_replace(array('&lt;', '&gt;', '&amp;', '&quot;'), array('<', '>', '&', '"'), $body);
                 if (!$message_id && defined('PHORUM_CONTROL_CENTER')) {
                     // we're in control.php, so it was double-escaped
-                    $body = str_replace(array('&lt;','&gt;','&amp;', '&quot;'), array('<','>','&','"'), $body);
+                    $body = str_replace(array('&lt;', '&gt;', '&amp;', '&quot;'), array('<', '>', '&', '"'), $body);
                 }
             }
 
@@ -103,15 +103,15 @@ 
             // a lot zippier.
 
             if ($message_id) { // make sure it's not a fake id
-                $updated_message['meta'] = $message['meta'];
-                $updated_message['meta']['body_cache'] = base64_encode($body);
-                $updated_message['meta']['body_cache_serial'] = $cache_serial;
+                $updated_message[ 'meta' ] = $message[ 'meta' ];
+                $updated_message[ 'meta' ][ 'body_cache' ] = base64_encode($body);
+                $updated_message[ 'meta' ][ 'body_cache_serial' ] = $cache_serial;
                 phorum_db_update_message($message_id, $updated_message);
             }
 
             // must not get overloaded until after we cache it, otherwise
             // we'll inadvertently change the original text
-            $data[$message_id]['body'] = $body;
+            $data[ $message_id ][ 'body' ] = $body;
 
         }
     }
@@ -129,11 +129,11 @@ 
 function phorum_htmlpurifier_generate_sig($row)
 {
     $phorum_sig = '';
-    if(isset($row["user"]["signature"])
-       && isset($row['meta']['show_signature']) && $row['meta']['show_signature']==1){
-           $phorum_sig=trim($row["user"]["signature"]);
-           if(!empty($phorum_sig)){
-               $phorum_sig="\n\n$phorum_sig";
+    if (isset($row[ "user" ][ "signature" ])
+       && isset($row[ 'meta' ][ 'show_signature' ]) && $row[ 'meta' ][ 'show_signature' ] == 1) {
+           $phorum_sig = trim($row[ "user" ][ "signature" ]);
+           if (!empty($phorum_sig)) {
+               $phorum_sig = "\n\n$phorum_sig";
            }
     }
     return $phorum_sig;
@@ -144,12 +144,12 @@ 
  */
 function phorum_htmlpurifier_generate_editmessage($row)
 {
-    $PHORUM = $GLOBALS['PHORUM'];
+    $PHORUM = $GLOBALS[ 'PHORUM' ];
     $editmessage = '';
-    if(isset($row['meta']['edit_count']) && $row['meta']['edit_count'] > 0) {
-        $editmessage = str_replace ("%count%", $row['meta']['edit_count'], $PHORUM["DATA"]["LANG"]["EditedMessage"]);
-        $editmessage = str_replace ("%lastedit%", phorum_date($PHORUM["short_date_time"],$row['meta']['edit_date']),  $editmessage);
-        $editmessage = str_replace ("%lastuser%", $row['meta']['edit_username'],  $editmessage);
+    if (isset($row[ 'meta' ][ 'edit_count' ]) && $row[ 'meta' ][ 'edit_count' ] > 0) {
+        $editmessage = str_replace("%count%", $row[ 'meta' ][ 'edit_count' ], $PHORUM[ "DATA" ][ "LANG" ][ "EditedMessage" ]);
+        $editmessage = str_replace("%lastedit%", phorum_date($PHORUM[ "short_date_time" ], $row[ 'meta' ][ 'edit_date' ]), $editmessage);
+        $editmessage = str_replace("%lastuser%", $row[ 'meta' ][ 'edit_username' ], $editmessage);
         $editmessage = "\n\n\n\n$editmessage";
     }
     return $editmessage;
@@ -169,9 +169,9 @@ 
     $replacements = array();
     // we need to remove add <phorum break> as that is the form these
     // extra bits are in.
-    if ($signature) $replacements[str_replace("\n", "<phorum break>\n", $signature)] = '';
-    if ($editmessage) $replacements[str_replace("\n", "<phorum break>\n", $editmessage)] = '';
-    $row['body'] = strtr($row['body'], $replacements);
+    if ($signature) $replacements[ str_replace("\n", "<phorum break>\n", $signature) ] = '';
+    if ($editmessage) $replacements[ str_replace("\n", "<phorum break>\n", $editmessage) ] = '';
+    $row[ 'body' ] = strtr($row[ 'body' ], $replacements);
     return array($signature, $editmessage);
 }
 
@@ -183,9 +183,9 @@ 
  */
 function phorum_htmlpurifier_posting($message)
 {
-    $PHORUM = $GLOBALS["PHORUM"];
-    unset($message['meta']['body_cache']); // invalidate the cache
-    $message['meta']['body_cache_serial'] = $PHORUM['mod_htmlpurifier']['body_cache_serial'];
+    $PHORUM = $GLOBALS[ "PHORUM" ];
+    unset($message[ 'meta' ][ 'body_cache' ]); // invalidate the cache
+    $message[ 'meta' ][ 'body_cache_serial' ] = $PHORUM[ 'mod_htmlpurifier' ][ 'body_cache_serial' ];
     return $message;
 }
 
@@ -194,10 +194,10 @@ 
  */
 function phorum_htmlpurifier_quote($array)
 {
-    $PHORUM = $GLOBALS["PHORUM"];
-    $purifier =& HTMLPurifier::getInstance();
-    $text = $purifier->purify($array[1]);
-    $source = htmlspecialchars($array[0]);
+    $PHORUM = $GLOBALS[ "PHORUM" ];
+    $purifier = & HTMLPurifier::getInstance();
+    $text = $purifier->purify($array[ 1 ]);
+    $source = htmlspecialchars($array[ 0 ]);
     return "<blockquote cite=\"$source\">\n$text\n</blockquote>";
 }
 
@@ -214,11 +214,11 @@ 
     HTMLPurifier::getInstance($config);
 
     // increment revision.txt if you want to invalidate the cache
-    $GLOBALS['PHORUM']['mod_htmlpurifier']['body_cache_serial'] = $config->getSerial();
+    $GLOBALS[ 'PHORUM' ][ 'mod_htmlpurifier' ][ 'body_cache_serial' ] = $config->getSerial();
 
     // load migration
-    if (file_exists(dirname(__FILE__) . '/migrate.php')) {
-        include(dirname(__FILE__) . '/migrate.php');
+    if (file_exists(dirname(__FILE__).'/migrate.php')) {
+        include(dirname(__FILE__).'/migrate.php');
     } else {
         echo '<strong>Error:</strong> No migration path specified for HTML Purifier, please check
         <tt>modes/htmlpurifier/migrate.bbcode.php</tt> for instructions on
@@ -228,7 +228,7 @@ 
 
     if (!function_exists('phorum_htmlpurifier_migrate')) {
         // Dummy function
-        function phorum_htmlpurifier_migrate($data) {return $data;}
+        function phorum_htmlpurifier_migrate($data) {return $data; }
     }
 
 }
@@ -239,16 +239,16 @@ 
  */
 function phorum_htmlpurifier_before_editor($message)
 {
-    if (!empty($GLOBALS['PHORUM']['mod_htmlpurifier']['wysiwyg'])) {
-        if (!empty($message['body'])) {
-            $body = $message['body'];
+    if (!empty($GLOBALS[ 'PHORUM' ][ 'mod_htmlpurifier' ][ 'wysiwyg' ])) {
+        if (!empty($message[ 'body' ])) {
+            $body = $message[ 'body' ];
             // de-entity-ize contents
-            $body = str_replace(array('&lt;','&gt;','&amp;'), array('<','>','&'), $body);
-            $purifier =& HTMLPurifier::getInstance();
+            $body = str_replace(array('&lt;', '&gt;', '&amp;'), array('<', '>', '&'), $body);
+            $purifier = & HTMLPurifier::getInstance();
             $body = $purifier->purify($body);
             // re-entity-ize contents
-            $body = htmlspecialchars($body, ENT_QUOTES, $GLOBALS['PHORUM']['DATA']['CHARSET']);
-            $message['body'] = $body;
+            $body = htmlspecialchars($body, ENT_QUOTES, $GLOBALS[ 'PHORUM' ][ 'DATA' ][ 'CHARSET' ]);
+            $message[ 'body' ] = $body;
         }
     }
     return $message;
@@ -258,8 +258,8 @@ 
 {
     // don't show this message if it's a WYSIWYG editor, since it will
     // then be handled automatically
-    if (!empty($GLOBALS['PHORUM']['mod_htmlpurifier']['wysiwyg'])) {
-        $i = $GLOBALS['PHORUM']['DATA']['MODE'];
+    if (!empty($GLOBALS[ 'PHORUM' ][ 'mod_htmlpurifier' ][ 'wysiwyg' ])) {
+        $i = $GLOBALS[ 'PHORUM' ][ 'DATA' ][ 'MODE' ];
         if ($i == 'quote' || $i == 'edit' || $i == 'moderation') {
           ?>
           <div>
@@ -273,13 +273,13 @@ 
         }
         return;
     }
-    if (!empty($GLOBALS['PHORUM']['mod_htmlpurifier']['suppress_message'])) return;
+    if (!empty($GLOBALS[ 'PHORUM' ][ 'mod_htmlpurifier' ][ 'suppress_message' ])) return;
     ?><div class="htmlpurifier-help">
     <p>
         <strong>HTML input</strong> is enabled. Make sure you escape all HTML and
         angled brackets with <code>&amp;lt;</code> and <code>&amp;gt;</code>.
     </p><?php
-            $purifier =& HTMLPurifier::getInstance();
+            $purifier = & HTMLPurifier::getInstance();
             $config = $purifier->config;
             if ($config->get('AutoFormat.AutoParagraph')) {
                 ?><p>
@@ -290,7 +290,7 @@ 
             }
             $html_definition = $config->getDefinition('HTML');
             $allowed = array();
-            foreach ($html_definition->info as $name => $x) $allowed[] = "<code>$name</code>";
+            foreach ($html_definition->info as $name => $x) $allowed[ ] = "<code>$name</code>";
             sort($allowed);
             $allowed_text = implode(', ', $allowed);
             ?><p><strong>Allowed tags:</strong> <?php

Braces +12 added lines, -4 removed lines

@@ -169,8 +169,12 @@ 
     $replacements = array();
     // we need to remove add <phorum break> as that is the form these
     // extra bits are in.
-    if ($signature) $replacements[str_replace("\n", "<phorum break>\n", $signature)] = '';
-    if ($editmessage) $replacements[str_replace("\n", "<phorum break>\n", $editmessage)] = '';
+    if ($signature) {
+        $replacements[str_replace("\n", "<phorum break>\n", $signature)] = '';
+    }
+    if ($editmessage) {
+        $replacements[str_replace("\n", "<phorum break>\n", $editmessage)] = '';
+    }
     $row['body'] = strtr($row['body'], $replacements);
     return array($signature, $editmessage);
 }
@@ -273,7 +277,9 @@ 
         }
         return;
     }
-    if (!empty($GLOBALS['PHORUM']['mod_htmlpurifier']['suppress_message'])) return;
+    if (!empty($GLOBALS['PHORUM']['mod_htmlpurifier']['suppress_message'])) {
+        return;
+    }
     ?><div class="htmlpurifier-help">
     <p>
         <strong>HTML input</strong> is enabled. Make sure you escape all HTML and
@@ -290,7 +296,9 @@ 
             }
             $html_definition = $config->getDefinition('HTML');
             $allowed = array();
-            foreach ($html_definition->info as $name => $x) $allowed[] = "<code>$name</code>";
+            foreach ($html_definition->info as $name => $x) {
+                $allowed[] = "<code>$name</code>";
+            }
             sort($allowed);
             $allowed_text = implode(', ', $allowed);
             ?><p><strong>Allowed tags:</strong> <?php

vendor/ezyang/htmlpurifier/plugins/phorum/settings/form.php

Spacing +6 added lines, -6 removed lines

@@ -11,11 +11,11 @@ 
 
     $config = phorum_htmlpurifier_get_config();
 
-    $frm = new PhorumInputForm ("", "post", "Save");
+    $frm = new PhorumInputForm("", "post", "Save");
     $frm->hidden("module", "modsettings");
     $frm->hidden("mod", "htmlpurifier"); // this is the directory name that the Settings file lives in
 
-    if (!empty($error)){
+    if (!empty($error)) {
         echo "$error<br />";
     }
 
@@ -25,12 +25,12 @@ 
     When checked, contents sent for edit are now purified and the
     informative message is disabled. If your WYSIWYG editor is disabled for
     admin edits, you can safely keep this unchecked.</p>');
-    $frm->addRow('Use WYSIWYG?', $frm->checkbox('wysiwyg', '1', '', $PHORUM['mod_htmlpurifier']['wysiwyg']));
+    $frm->addRow('Use WYSIWYG?', $frm->checkbox('wysiwyg', '1', '', $PHORUM[ 'mod_htmlpurifier' ][ 'wysiwyg' ]));
 
     $frm->addMessage('<p>The box below sets <code>$PHORUM[\'mod_htmlpurifier\'][\'suppress_message\']</code>,
     which removes the big how-to use
     HTML Purifier message.</p>');
-    $frm->addRow('Suppress information?', $frm->checkbox('suppress_message', '1', '', $PHORUM['mod_htmlpurifier']['suppress_message']));
+    $frm->addRow('Suppress information?', $frm->checkbox('suppress_message', '1', '', $PHORUM[ 'mod_htmlpurifier' ][ 'suppress_message' ]));
 
     $frm->addMessage('<p>Click on directive links to read what each option does
     (links do not open in new windows).</p>
@@ -44,7 +44,7 @@ 
     $htmlpurifier_form->setTextareaDimensions(23, 7); // widen a little, since we have space
 
     $frm->addMessage($htmlpurifier_form->render(
-        $config, $PHORUM['mod_htmlpurifier']['directives'], false));
+        $config, $PHORUM[ 'mod_htmlpurifier' ][ 'directives' ], false));
 
     $frm->addMessage("<strong>Warning: Changing HTML Purifier's configuration will invalidate
       the cache. Expect to see a flurry of database activity after you change
@@ -53,7 +53,7 @@ 
     $frm->addrow('Reset to defaults:', $frm->checkbox("reset", "1", "", false));
 
     // hack to include extra styling
-    echo '<style type="text/css">' . $htmlpurifier_form->getCSS() . '
+    echo '<style type="text/css">'.$htmlpurifier_form->getCSS().'
     .hp-config {margin-left:auto;margin-right:auto;}
     </style>';
     $js = $htmlpurifier_form->getJavaScript();

vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php

Spacing +21 added lines, -21 removed lines

@@ -4,16 +4,16 @@ 
 {
     global $PHORUM;
     $offset = 0;
-    if (!empty($_POST['migrate-sigs'])) {
-        if (!isset($_POST['confirmation']) || strtolower($_POST['confirmation']) !== 'yes') {
+    if (!empty($_POST[ 'migrate-sigs' ])) {
+        if (!isset($_POST[ 'confirmation' ]) || strtolower($_POST[ 'confirmation' ]) !== 'yes') {
             echo 'Invalid confirmation code.';
             exit;
         }
-        $PHORUM['mod_htmlpurifier']['migrate-sigs'] = true;
-        phorum_db_update_settings(array("mod_htmlpurifier"=>$PHORUM["mod_htmlpurifier"]));
+        $PHORUM[ 'mod_htmlpurifier' ][ 'migrate-sigs' ] = true;
+        phorum_db_update_settings(array("mod_htmlpurifier"=>$PHORUM[ "mod_htmlpurifier" ]));
         $offset = 1;
-    } elseif (!empty($_GET['migrate-sigs']) && $PHORUM['mod_htmlpurifier']['migrate-sigs']) {
-        $offset = (int) $_GET['migrate-sigs'];
+    } elseif (!empty($_GET[ 'migrate-sigs' ]) && $PHORUM[ 'mod_htmlpurifier' ][ 'migrate-sigs' ]) {
+        $offset = (int) $_GET[ 'migrate-sigs' ];
     }
     return $offset;
 }
@@ -22,32 +22,32 @@ 
 {
     global $PHORUM;
 
-    if(!$offset) return; // bail out quick if $offset == 0
+    if (!$offset) return; // bail out quick if $offset == 0
 
     // theoretically, we could get rid of this multi-request
     // doo-hickery if safe mode is off
     @set_time_limit(0); // attempt to let this run
-    $increment = $PHORUM['mod_htmlpurifier']['migrate-sigs-increment'];
+    $increment = $PHORUM[ 'mod_htmlpurifier' ][ 'migrate-sigs-increment' ];
 
-    require_once(dirname(__FILE__) . '/../migrate.php');
+    require_once(dirname(__FILE__).'/../migrate.php');
     // migrate signatures
     // do this in batches so we don't run out of time/space
     $end = $offset + $increment;
     $user_ids = array();
     for ($i = $offset; $i < $end; $i++) {
-        $user_ids[] = $i;
+        $user_ids[ ] = $i;
     }
     $userinfos = phorum_db_user_get_fields($user_ids, 'signature');
     foreach ($userinfos as $i => $user) {
-        if (empty($user['signature'])) continue;
-        $sig = $user['signature'];
+        if (empty($user[ 'signature' ])) continue;
+        $sig = $user[ 'signature' ];
         // perform standard Phorum processing on the sig
-        $sig = str_replace(array("&","<",">"), array("&amp;","&lt;","&gt;"), $sig);
+        $sig = str_replace(array("&", "<", ">"), array("&amp;", "&lt;", "&gt;"), $sig);
         $sig = preg_replace("/<((http|https|ftp):\/\/[a-z0-9;\/\?:@=\&\$\-_\.\+!*'\(\),~%]+?)>/i", "$1", $sig);
         // prepare fake data to pass to migration function
         $fake_data = array(array("author"=>"", "email"=>"", "subject"=>"", 'body' => $sig));
         list($fake_message) = phorum_htmlpurifier_migrate($fake_data);
-        $user['signature'] = $fake_message['body'];
+        $user[ 'signature' ] = $fake_message[ 'body' ];
         if (!phorum_api_user_save($user)) {
             exit('Error while saving user data');
         }
@@ -55,21 +55,21 @@ 
     unset($userinfos); // free up memory
 
     // query for highest ID in database
-    $type = $PHORUM['DBCONFIG']['type'];
-    $sql = "select MAX(user_id) from {$PHORUM['user_table']}";
+    $type = $PHORUM[ 'DBCONFIG' ][ 'type' ];
+    $sql = "select MAX(user_id) from {$PHORUM[ 'user_table' ]}";
     $row = phorum_db_interact(DB_RETURN_ROW, $sql);
-    $top_id = (int) $row[0];
+    $top_id = (int) $row[ 0 ];
 
     $offset += $increment;
     if ($offset > $top_id) { // test for end condition
         echo 'Migration finished';
-        $PHORUM['mod_htmlpurifier']['migrate-sigs'] = false;
+        $PHORUM[ 'mod_htmlpurifier' ][ 'migrate-sigs' ] = false;
         phorum_htmlpurifier_commit_settings();
         return true;
     }
-    $host  = $_SERVER['HTTP_HOST'];
-    $uri   = rtrim(dirname($_SERVER['PHP_SELF']), '/\\');
-    $extra = 'admin.php?module=modsettings&mod=htmlpurifier&migrate-sigs=' . $offset;
+    $host  = $_SERVER[ 'HTTP_HOST' ];
+    $uri   = rtrim(dirname($_SERVER[ 'PHP_SELF' ]), '/\\');
+    $extra = 'admin.php?module=modsettings&mod=htmlpurifier&migrate-sigs='.$offset;
     // relies on output buffering to work
     header("Location: http://$host$uri/$extra");
     exit;

Braces +7 added lines, -2 removed lines

@@ -22,7 +22,10 @@ 
 {
     global $PHORUM;
 
-    if(!$offset) return; // bail out quick if $offset == 0
+    if(!$offset) {
+        return;
+    }
+    // bail out quick if $offset == 0
 
     // theoretically, we could get rid of this multi-request
     // doo-hickery if safe mode is off
@@ -39,7 +42,9 @@ 
     }
     $userinfos = phorum_db_user_get_fields($user_ids, 'signature');
     foreach ($userinfos as $i => $user) {
-        if (empty($user['signature'])) continue;
+        if (empty($user['signature'])) {
+            continue;
+        }
         $sig = $user['signature'];
         // perform standard Phorum processing on the sig
         $sig = str_replace(array("&","<",">"), array("&amp;","&lt;","&gt;"), $sig);

vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php

Spacing +7 added lines, -7 removed lines

@@ -8,13 +8,13 @@ 
         settings, edit that file. To use the web form, delete that file.<br />";
     } else {
         $config = phorum_htmlpurifier_get_config(true);
-        if (!isset($_POST['reset'])) $config->mergeArrayFromForm($_POST, 'config', $PHORUM['mod_htmlpurifier']['directives']);
-        $PHORUM['mod_htmlpurifier']['config'] = $config->getAll();
+        if (!isset($_POST[ 'reset' ])) $config->mergeArrayFromForm($_POST, 'config', $PHORUM[ 'mod_htmlpurifier' ][ 'directives' ]);
+        $PHORUM[ 'mod_htmlpurifier' ][ 'config' ] = $config->getAll();
     }
-    $PHORUM['mod_htmlpurifier']['wysiwyg'] = !empty($_POST['wysiwyg']);
-    $PHORUM['mod_htmlpurifier']['suppress_message'] = !empty($_POST['suppress_message']);
-    if(!phorum_htmlpurifier_commit_settings()){
-        $error="Database error while updating settings.";
+    $PHORUM[ 'mod_htmlpurifier' ][ 'wysiwyg' ] = !empty($_POST[ 'wysiwyg' ]);
+    $PHORUM[ 'mod_htmlpurifier' ][ 'suppress_message' ] = !empty($_POST[ 'suppress_message' ]);
+    if (!phorum_htmlpurifier_commit_settings()) {
+        $error = "Database error while updating settings.";
     } else {
         echo "Settings Updated<br />";
     }
@@ -23,7 +23,7 @@ 
 function phorum_htmlpurifier_commit_settings()
 {
     global $PHORUM;
-    return phorum_db_update_settings(array("mod_htmlpurifier"=>$PHORUM["mod_htmlpurifier"]));
+    return phorum_db_update_settings(array("mod_htmlpurifier"=>$PHORUM[ "mod_htmlpurifier" ]));
 }
 
 // vim: et sw=4 sts=4

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
         settings, edit that file. To use the web form, delete that file.<br />";
     } else {
         $config = phorum_htmlpurifier_get_config(true);
-        if (!isset($_POST['reset'])) $config->mergeArrayFromForm($_POST, 'config', $PHORUM['mod_htmlpurifier']['directives']);
+        if (!isset($_POST['reset'])) {
+            $config->mergeArrayFromForm($_POST, 'config', $PHORUM['mod_htmlpurifier']['directives']);
+        }
         $PHORUM['mod_htmlpurifier']['config'] = $config->getAll();
     }
     $PHORUM['mod_htmlpurifier']['wysiwyg'] = !empty($_POST['wysiwyg']);

vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs-form.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 function phorum_htmlpurifier_show_migrate_sigs_form()
 {
-    $frm = new PhorumInputForm ('', "post", "Migrate");
+    $frm = new PhorumInputForm('', "post", "Migrate");
     $frm->hidden("module", "modsettings");
     $frm->hidden("mod", "htmlpurifier");
     $frm->hidden("migrate-sigs", "1");
@@ -10,7 +10,7 @@ 
     $frm->addMessage('This operation will migrate your users signatures
         to HTML. <strong>This process is irreversible and must only be performed once.</strong>
         Type in yes in the confirmation field to migrate.');
-    if (!file_exists(dirname(__FILE__) . '/../migrate.php')) {
+    if (!file_exists(dirname(__FILE__).'/../migrate.php')) {
         $frm->addMessage('Migration file does not exist, cannot migrate signatures.
             Please check <tt>migrate.bbcode.php</tt> on how to create an appropriate file.');
     } else {