From cb39d9435da54239e8e36d2d53877a19c10bab83 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 4 Dec 2017 15:14:58 -0800 Subject: We only require one Update module. The rest are superfluous. --- Zotlabs/Module/Update.php | 34 ++++++++++++++++++ Zotlabs/Module/Update_articles.php | 39 --------------------- Zotlabs/Module/Update_cards.php | 39 --------------------- Zotlabs/Module/Update_channel.php | 70 ------------------------------------- Zotlabs/Module/Update_display.php | 32 ----------------- Zotlabs/Module/Update_home.php | 42 ---------------------- Zotlabs/Module/Update_hq.php | 31 ---------------- Zotlabs/Module/Update_network.php | 44 ----------------------- Zotlabs/Module/Update_pubstream.php | 26 -------------- Zotlabs/Module/Update_search.php | 69 ------------------------------------ view/tpl/build_query.tpl | 2 +- 11 files changed, 35 insertions(+), 393 deletions(-) create mode 100644 Zotlabs/Module/Update.php delete mode 100644 Zotlabs/Module/Update_articles.php delete mode 100644 Zotlabs/Module/Update_cards.php delete mode 100644 Zotlabs/Module/Update_channel.php delete mode 100644 Zotlabs/Module/Update_display.php delete mode 100644 Zotlabs/Module/Update_home.php delete mode 100644 Zotlabs/Module/Update_hq.php delete mode 100644 Zotlabs/Module/Update_network.php delete mode 100644 Zotlabs/Module/Update_pubstream.php delete mode 100644 Zotlabs/Module/Update_search.php diff --git a/Zotlabs/Module/Update.php b/Zotlabs/Module/Update.php new file mode 100644 index 000000000..e7470363b --- /dev/null +++ b/Zotlabs/Module/Update.php @@ -0,0 +1,34 @@ + 2) && (argv(2) == 'load')) ? 1 : 0); + + $mod = new $module; + + header("Content-type: text/html"); + + echo "

\r\n"; + echo $mod->get($profile_uid, $load); + echo "

\r\n"; + + killme(); + + } +} diff --git a/Zotlabs/Module/Update_articles.php b/Zotlabs/Module/Update_articles.php deleted file mode 100644 index 280904f67..000000000 --- a/Zotlabs/Module/Update_articles.php +++ /dev/null @@ -1,39 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - - header("Content-type: text/html"); - echo "

\r\n"; - - killme(); - - - $mod = new Articles(); - - $text = $mod->get($profile_uid,$load); - - /** - * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well - */ - - echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '' : ''); - echo "\r\n"; - killme(); - -} -} diff --git a/Zotlabs/Module/Update_cards.php b/Zotlabs/Module/Update_cards.php deleted file mode 100644 index bb87357e8..000000000 --- a/Zotlabs/Module/Update_cards.php +++ /dev/null @@ -1,39 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - - header("Content-type: text/html"); - echo "

\r\n"; - - killme(); - - - $mod = new Cards(); - - $text = $mod->get($profile_uid,$load); - - /** - * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well - */ - - echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '' : ''); - echo "\r\n"; - killme(); - -} -} diff --git a/Zotlabs/Module/Update_channel.php b/Zotlabs/Module/Update_channel.php deleted file mode 100644 index 46ad19805..000000000 --- a/Zotlabs/Module/Update_channel.php +++ /dev/null @@ -1,70 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - - header("Content-type: text/html"); - echo "\r\n"; - - /** - * We can remove this hack once Internet Explorer recognises HTML5 natively - */ - - echo (($_GET['msie'] == 1) ? '

' : '

'); - - /** - * - * Grab the page inner contents by calling the content function from the profile module directly, - * but move any image src attributes to another attribute name. This is because - * some browsers will prefetch all the images for the page even if we don't need them. - * The only ones we need to fetch are those for new page additions, which we'll discover - * on the client side and then swap the image back. - * - */ - - $mod = new Channel(); - - $text = $mod->get($profile_uid,$load); - - $pattern = "/]*) src=\"([^\"]*)\"/"; - $replace = "'; - $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; - $text = preg_replace($pattern, $replace, $text); - } -*/ - - /** - * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well - */ - - echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '

' : ''); - echo "\r\n"; - killme(); - -} -} diff --git a/Zotlabs/Module/Update_display.php b/Zotlabs/Module/Update_display.php deleted file mode 100644 index b2c6a56f5..000000000 --- a/Zotlabs/Module/Update_display.php +++ /dev/null @@ -1,32 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - header("Content-type: text/html"); - echo "\r\n"; - echo (($_GET['msie'] == 1) ? '

' : '

'); - - $mod = new Display(); - $text = $mod->get($profile_uid, $load); - - echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '

' : ''); - echo "\r\n"; - - killme(); - - } - -} diff --git a/Zotlabs/Module/Update_home.php b/Zotlabs/Module/Update_home.php deleted file mode 100644 index 0f699482e..000000000 --- a/Zotlabs/Module/Update_home.php +++ /dev/null @@ -1,42 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - header("Content-type: text/html"); - echo "\r\n"; - echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '

' : '

'); - - $mod = new Home(); - $text = $mod->get($profile_uid, $load); - - $pattern = "/]*) src=\"([^\"]*)\"/"; - $replace = "'; - $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; - $text = preg_replace($pattern, $replace, $text); - } - */ - echo str_replace("\t",' ',$text); - echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '

' : ''); - echo "\r\n"; - // logger('update_home: ' . $text); - killme(); - - } -} diff --git a/Zotlabs/Module/Update_hq.php b/Zotlabs/Module/Update_hq.php deleted file mode 100644 index bb1495c64..000000000 --- a/Zotlabs/Module/Update_hq.php +++ /dev/null @@ -1,31 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - header("Content-type: text/html"); - echo "\r\n"; - echo (($_GET['msie'] == 1) ? '

' : '

'); - - $mod = new Hq(); - $text = $mod->get($profile_uid, $load); - - echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '

' : ''); - echo "\r\n"; - - killme(); - - } - -} diff --git a/Zotlabs/Module/Update_network.php b/Zotlabs/Module/Update_network.php deleted file mode 100644 index c27b7614a..000000000 --- a/Zotlabs/Module/Update_network.php +++ /dev/null @@ -1,44 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - header("Content-type: text/html"); - echo "\r\n"; - echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '

' : '

'); - - $mod = new Network(); - $text = $mod->get($profile_uid, $load); - - $pattern = "/]*) src=\"([^\"]*)\"/"; - $replace = "'; - $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; - $text = preg_replace($pattern, $replace, $text); - } - */ - echo str_replace("\t",' ',$text); - echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '

' : ''); - echo "\r\n"; - // logger('update_network: ' . $text); - killme(); - - } -} diff --git a/Zotlabs/Module/Update_pubstream.php b/Zotlabs/Module/Update_pubstream.php deleted file mode 100644 index 8bb5ebfe7..000000000 --- a/Zotlabs/Module/Update_pubstream.php +++ /dev/null @@ -1,26 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - header("Content-type: text/html"); - echo "\r\n"; - echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '

' : '

'); - - $mod = new Pubstream(); - $text = $mod->get($profile_uid, $load); - - echo str_replace("\t",' ',$text); - echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '

' : ''); - echo "\r\n"; - killme(); - - } -} diff --git a/Zotlabs/Module/Update_search.php b/Zotlabs/Module/Update_search.php deleted file mode 100644 index 4491f40f4..000000000 --- a/Zotlabs/Module/Update_search.php +++ /dev/null @@ -1,69 +0,0 @@ - 1) && (argv(1) == 'load')) ? 1 : 0); - - header("Content-type: text/html"); - echo "\r\n"; - - /** - * We can remove this hack once Internet Explorer recognises HTML5 natively - */ - - echo (($_GET['msie'] == 1) ? '

' : '

'); - - /** - * - * Grab the page inner contents by calling the content function from the profile module directly, - * but move any image src attributes to another attribute name. This is because - * some browsers will prefetch all the images for the page even if we don't need them. - * The only ones we need to fetch are those for new page additions, which we'll discover - * on the client side and then swap the image back. - * - */ - - $mod = new Search(); - $text = $mod->get($profile_uid,$load); - - $pattern = "/]*) src=\"([^\"]*)\"/"; - $replace = "'; - $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; - $text = preg_replace($pattern, $replace, $text); - } - */ - /** - * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well - */ - - echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '

' : ''); - echo "\r\n"; - killme(); - - } -} diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index bfe5c8a08..1d938d395 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -1,6 +1,6 @@ +{{/if}} -- cgit v1.2.3 From a604236d89a843a10af1a87f5e9a5cdac153b3ab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 6 Dec 2017 12:40:27 +0100 Subject: missed a spot while resolving merge conflict --- Zotlabs/Module/Wiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 4ccb3b5db..ae543eb98 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -575,7 +575,7 @@ class Wiki extends \Zotlabs\Web\Controller { // backslashes won't work well in the javascript functions $name = str_replace('\\','',$name); - if(urlencode(escape_tags($_POST['pageName'])) === '') { + if(urlencode(escape_tags($name)) === '') { json_return_and_die(array('message' => 'Error creating page. Invalid name (' . print_r($_POST,true) . ').', 'success' => false)); } -- cgit v1.2.3