@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | // default HTML Purifier configuration settings |
6 | 6 | $config->set('HTML.Allowed', |
7 | - // alphabetically sorted |
|
7 | + // alphabetically sorted |
|
8 | 8 | 'a[href|title] |
9 | 9 | abbr[title] |
10 | 10 | acronym[title] |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $config->set('Core.AggressivelyFixLt', true); |
52 | 52 | $config->set('Core.Encoding', $GLOBALS['PHORUM']['DATA']['CHARSET']); // we'll change this eventually |
53 | 53 | if (strtolower($GLOBALS['PHORUM']['DATA']['CHARSET']) !== 'utf-8') { |
54 | - $config->set('Core.EscapeNonASCIICharacters', true); |
|
54 | + $config->set('Core.EscapeNonASCIICharacters', true); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | // vim: et sw=4 sts=4 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if(!defined("PHORUM")) exit; |
|
3 | +if (!defined("PHORUM")) exit; |
|
4 | 4 | |
5 | 5 | // default HTML Purifier configuration settings |
6 | 6 | $config->set('HTML.Allowed', |
@@ -15,7 +15,9 @@ |
||
15 | 15 | * explicitly says, "No, I do not need to migrate." |
16 | 16 | */ |
17 | 17 | |
18 | -if(!defined("PHORUM")) exit; |
|
18 | +if(!defined("PHORUM")) { |
|
19 | + exit; |
|
20 | +} |
|
19 | 21 | |
20 | 22 | require_once(dirname(__FILE__) . "/../bbcode/bbcode.php"); |
21 | 23 |
@@ -9,19 +9,19 @@ discard block |
||
9 | 9 | * by creating a 'config.php' file. |
10 | 10 | */ |
11 | 11 | |
12 | -if(!defined("PHORUM_ADMIN")) exit; |
|
12 | +if (!defined("PHORUM_ADMIN")) exit; |
|
13 | 13 | |
14 | 14 | // error reporting is good! |
15 | 15 | error_reporting(E_ALL ^ E_NOTICE); |
16 | 16 | |
17 | 17 | // load library and other paraphenalia |
18 | 18 | require_once './include/admin/PhorumInputForm.php'; |
19 | -require_once (dirname(__FILE__) . '/htmlpurifier/HTMLPurifier.auto.php'); |
|
20 | -require_once (dirname(__FILE__) . '/init-config.php'); |
|
21 | -require_once (dirname(__FILE__) . '/settings/migrate-sigs-form.php'); |
|
22 | -require_once (dirname(__FILE__) . '/settings/migrate-sigs.php'); |
|
23 | -require_once (dirname(__FILE__) . '/settings/form.php'); |
|
24 | -require_once (dirname(__FILE__) . '/settings/save.php'); |
|
19 | +require_once (dirname(__FILE__).'/htmlpurifier/HTMLPurifier.auto.php'); |
|
20 | +require_once (dirname(__FILE__).'/init-config.php'); |
|
21 | +require_once (dirname(__FILE__).'/settings/migrate-sigs-form.php'); |
|
22 | +require_once (dirname(__FILE__).'/settings/migrate-sigs.php'); |
|
23 | +require_once (dirname(__FILE__).'/settings/form.php'); |
|
24 | +require_once (dirname(__FILE__).'/settings/save.php'); |
|
25 | 25 | |
26 | 26 | // define friendly configuration directives. you can expand this array |
27 | 27 | // to get more web-definable directives |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | if ($offset = phorum_htmlpurifier_migrate_sigs_check()) { |
53 | 53 | // migrate signatures |
54 | 54 | phorum_htmlpurifier_migrate_sigs($offset); |
55 | -} elseif(!empty($_POST)){ |
|
55 | +} elseif (!empty($_POST)) { |
|
56 | 56 | // save settings |
57 | 57 | phorum_htmlpurifier_save_settings(); |
58 | 58 | } |
@@ -9,7 +9,9 @@ |
||
9 | 9 | * by creating a 'config.php' file. |
10 | 10 | */ |
11 | 11 | |
12 | -if(!defined("PHORUM_ADMIN")) exit; |
|
12 | +if(!defined("PHORUM_ADMIN")) { |
|
13 | + exit; |
|
14 | +} |
|
13 | 15 | |
14 | 16 | // error reporting is good! |
15 | 17 | error_reporting(E_ALL ^ E_NOTICE); |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | $config_exists = phorum_htmlpurifier_config_file_exists(); |
12 | 12 | if ($default || $config_exists || !isset($PHORUM['mod_htmlpurifier']['config'])) { |
13 | 13 | $config = HTMLPurifier_Config::createDefault(); |
14 | - include(dirname(__FILE__) . '/config.default.php'); |
|
14 | + include(dirname(__FILE__).'/config.default.php'); |
|
15 | 15 | if ($config_exists) { |
16 | - include(dirname(__FILE__) . '/config.php'); |
|
16 | + include(dirname(__FILE__).'/config.php'); |
|
17 | 17 | } |
18 | 18 | unset($PHORUM['mod_htmlpurifier']['config']); // unnecessary |
19 | 19 | } else { |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | function phorum_htmlpurifier_config_file_exists() |
26 | 26 | { |
27 | - return file_exists(dirname(__FILE__) . '/config.php'); |
|
27 | + return file_exists(dirname(__FILE__).'/config.php'); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | // vim: et sw=4 sts=4 |
@@ -15,9 +15,9 @@ |
||
15 | 15 | * explicitly says, "No, I do not need to migrate." |
16 | 16 | */ |
17 | 17 | |
18 | -if(!defined("PHORUM")) exit; |
|
18 | +if (!defined("PHORUM")) exit; |
|
19 | 19 | |
20 | -require_once(dirname(__FILE__) . "/../bbcode/bbcode.php"); |
|
20 | +require_once(dirname(__FILE__)."/../bbcode/bbcode.php"); |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * 'format' hook style function that will be called to convert |
@@ -15,7 +15,9 @@ |
||
15 | 15 | * explicitly says, "No, I do not need to migrate." |
16 | 16 | */ |
17 | 17 | |
18 | -if(!defined("PHORUM")) exit; |
|
18 | +if(!defined("PHORUM")) { |
|
19 | + exit; |
|
20 | +} |
|
19 | 21 | |
20 | 22 | require_once(dirname(__FILE__) . "/../bbcode/bbcode.php"); |
21 | 23 |
@@ -11,11 +11,11 @@ discard block |
||
11 | 11 | |
12 | 12 | $config = phorum_htmlpurifier_get_config(); |
13 | 13 | |
14 | - $frm = new PhorumInputForm ("", "post", "Save"); |
|
14 | + $frm = new PhorumInputForm("", "post", "Save"); |
|
15 | 15 | $frm->hidden("module", "modsettings"); |
16 | 16 | $frm->hidden("mod", "htmlpurifier"); // this is the directory name that the Settings file lives in |
17 | 17 | |
18 | - if (!empty($error)){ |
|
18 | + if (!empty($error)) { |
|
19 | 19 | echo "$error<br />"; |
20 | 20 | } |
21 | 21 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $frm->addrow('Reset to defaults:', $frm->checkbox("reset", "1", "", false)); |
54 | 54 | |
55 | 55 | // hack to include extra styling |
56 | - echo '<style type="text/css">' . $htmlpurifier_form->getCSS() . ' |
|
56 | + echo '<style type="text/css">'.$htmlpurifier_form->getCSS().' |
|
57 | 57 | .hp-config {margin-left:auto;margin-right:auto;} |
58 | 58 | </style>'; |
59 | 59 | $js = $htmlpurifier_form->getJavaScript(); |
@@ -13,8 +13,8 @@ |
||
13 | 13 | } |
14 | 14 | $PHORUM['mod_htmlpurifier']['wysiwyg'] = !empty($_POST['wysiwyg']); |
15 | 15 | $PHORUM['mod_htmlpurifier']['suppress_message'] = !empty($_POST['suppress_message']); |
16 | - if(!phorum_htmlpurifier_commit_settings()){ |
|
17 | - $error="Database error while updating settings."; |
|
16 | + if (!phorum_htmlpurifier_commit_settings()) { |
|
17 | + $error = "Database error while updating settings."; |
|
18 | 18 | } else { |
19 | 19 | echo "Settings Updated<br />"; |
20 | 20 | } |
@@ -8,7 +8,9 @@ |
||
8 | 8 | settings, edit that file. To use the web form, delete that file.<br />"; |
9 | 9 | } else { |
10 | 10 | $config = phorum_htmlpurifier_get_config(true); |
11 | - if (!isset($_POST['reset'])) $config->mergeArrayFromForm($_POST, 'config', $PHORUM['mod_htmlpurifier']['directives']); |
|
11 | + if (!isset($_POST['reset'])) { |
|
12 | + $config->mergeArrayFromForm($_POST, 'config', $PHORUM['mod_htmlpurifier']['directives']); |
|
13 | + } |
|
12 | 14 | $PHORUM['mod_htmlpurifier']['config'] = $config->getAll(); |
13 | 15 | } |
14 | 16 | $PHORUM['mod_htmlpurifier']['wysiwyg'] = !empty($_POST['wysiwyg']); |
@@ -22,14 +22,14 @@ discard block |
||
22 | 22 | { |
23 | 23 | global $PHORUM; |
24 | 24 | |
25 | - if(!$offset) return; // bail out quick if $offset == 0 |
|
25 | + if (!$offset) return; // bail out quick if $offset == 0 |
|
26 | 26 | |
27 | 27 | // theoretically, we could get rid of this multi-request |
28 | 28 | // doo-hickery if safe mode is off |
29 | 29 | @set_time_limit(0); // attempt to let this run |
30 | 30 | $increment = $PHORUM['mod_htmlpurifier']['migrate-sigs-increment']; |
31 | 31 | |
32 | - require_once(dirname(__FILE__) . '/../migrate.php'); |
|
32 | + require_once(dirname(__FILE__).'/../migrate.php'); |
|
33 | 33 | // migrate signatures |
34 | 34 | // do this in batches so we don't run out of time/space |
35 | 35 | $end = $offset + $increment; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | if (empty($user['signature'])) continue; |
43 | 43 | $sig = $user['signature']; |
44 | 44 | // perform standard Phorum processing on the sig |
45 | - $sig = str_replace(array("&","<",">"), array("&","<",">"), $sig); |
|
45 | + $sig = str_replace(array("&", "<", ">"), array("&", "<", ">"), $sig); |
|
46 | 46 | $sig = preg_replace("/<((http|https|ftp):\/\/[a-z0-9;\/\?:@=\&\$\-_\.\+!*'\(\),~%]+?)>/i", "$1", $sig); |
47 | 47 | // prepare fake data to pass to migration function |
48 | 48 | $fake_data = array(array("author"=>"", "email"=>"", "subject"=>"", 'body' => $sig)); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | $host = $_SERVER['HTTP_HOST']; |
71 | 71 | $uri = rtrim(dirname($_SERVER['PHP_SELF']), '/\\'); |
72 | - $extra = 'admin.php?module=modsettings&mod=htmlpurifier&migrate-sigs=' . $offset; |
|
72 | + $extra = 'admin.php?module=modsettings&mod=htmlpurifier&migrate-sigs='.$offset; |
|
73 | 73 | // relies on output buffering to work |
74 | 74 | header("Location: http://$host$uri/$extra"); |
75 | 75 | exit; |
@@ -22,7 +22,10 @@ discard block |
||
22 | 22 | { |
23 | 23 | global $PHORUM; |
24 | 24 | |
25 | - if(!$offset) return; // bail out quick if $offset == 0 |
|
25 | + if(!$offset) { |
|
26 | + return; |
|
27 | + } |
|
28 | + // bail out quick if $offset == 0 |
|
26 | 29 | |
27 | 30 | // theoretically, we could get rid of this multi-request |
28 | 31 | // doo-hickery if safe mode is off |
@@ -39,7 +42,9 @@ discard block |
||
39 | 42 | } |
40 | 43 | $userinfos = phorum_db_user_get_fields($user_ids, 'signature'); |
41 | 44 | foreach ($userinfos as $i => $user) { |
42 | - if (empty($user['signature'])) continue; |
|
45 | + if (empty($user['signature'])) { |
|
46 | + continue; |
|
47 | + } |
|
43 | 48 | $sig = $user['signature']; |
44 | 49 | // perform standard Phorum processing on the sig |
45 | 50 | $sig = str_replace(array("&","<",">"), array("&","<",">"), $sig); |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | function phorum_htmlpurifier_show_migrate_sigs_form() |
4 | 4 | { |
5 | - $frm = new PhorumInputForm ('', "post", "Migrate"); |
|
5 | + $frm = new PhorumInputForm('', "post", "Migrate"); |
|
6 | 6 | $frm->hidden("module", "modsettings"); |
7 | 7 | $frm->hidden("mod", "htmlpurifier"); |
8 | 8 | $frm->hidden("migrate-sigs", "1"); |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | $frm->addMessage('This operation will migrate your users signatures |
11 | 11 | to HTML. <strong>This process is irreversible and must only be performed once.</strong> |
12 | 12 | Type in yes in the confirmation field to migrate.'); |
13 | - if (!file_exists(dirname(__FILE__) . '/../migrate.php')) { |
|
13 | + if (!file_exists(dirname(__FILE__).'/../migrate.php')) { |
|
14 | 14 | $frm->addMessage('Migration file does not exist, cannot migrate signatures. |
15 | 15 | Please check <tt>migrate.bbcode.php</tt> on how to create an appropriate file.'); |
16 | 16 | } else { |
@@ -11,7 +11,7 @@ |
||
11 | 11 | array( |
12 | 12 | 'baseinstalldir' => '/', |
13 | 13 | 'packagefile' => 'package.xml', |
14 | - 'packagedirectory' => realpath(dirname(__FILE__) . '/library'), |
|
14 | + 'packagedirectory' => realpath(dirname(__FILE__).'/library'), |
|
15 | 15 | 'filelistgenerator' => 'file', |
16 | 16 | 'include' => array('*'), |
17 | 17 | 'dir_roles' => array('/' => 'php'), // hack to put *.ser files in the right place |