diff options
-rw-r--r-- | Zotlabs/Project/System.php | 2 | ||||
-rw-r--r-- | include/checksites.php | 4 | ||||
-rw-r--r-- | include/cli_suggest.php | 7 | ||||
-rw-r--r-- | include/cronhooks.php | 4 | ||||
-rw-r--r-- | include/deliver.php | 4 | ||||
-rw-r--r-- | include/deliver_hooks.php | 4 | ||||
-rw-r--r-- | include/directory.php | 4 | ||||
-rw-r--r-- | include/expire.php | 4 | ||||
-rw-r--r-- | include/externals.php | 4 | ||||
-rw-r--r-- | include/gprobe.php | 4 | ||||
-rwxr-xr-x | include/importdoc.php | 4 | ||||
-rw-r--r-- | include/notifier.php | 4 | ||||
-rw-r--r-- | include/onedirsync.php | 4 | ||||
-rw-r--r-- | include/onepoll.php | 4 | ||||
-rw-r--r-- | include/poller.php | 4 | ||||
-rw-r--r-- | include/queue.php | 4 | ||||
-rw-r--r-- | include/ratenotif.php | 4 | ||||
-rw-r--r-- | util/po2php.php | 4 |
18 files changed, 35 insertions, 38 deletions
diff --git a/Zotlabs/Project/System.php b/Zotlabs/Project/System.php index f61313da0..7ee848411 100644 --- a/Zotlabs/Project/System.php +++ b/Zotlabs/Project/System.php @@ -5,7 +5,7 @@ namespace Zotlabs\Project; class System { static public function get_platform_name() { - if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name']) + if(is_array(\App::$config) && is_array(\App::$config['system']) && array_key_exists('platform_name',\App::$config['system'])) return \App::$config['system']['platform_name']; return PLATFORM_NAME; } diff --git a/include/checksites.php b/include/checksites.php index e9c08c202..9d3ca1797 100644 --- a/include/checksites.php +++ b/include/checksites.php @@ -7,7 +7,7 @@ require_once('include/hubloc.php'); -function checksites_run($argv, $argc){ +function checksites_run($argc,$argv){ cli_startup(); @@ -57,6 +57,6 @@ function checksites_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - checksites_run($argv,$argc); + checksites_run($argc,$argv); killme(); } diff --git a/include/cli_suggest.php b/include/cli_suggest.php index 321ffd2e0..94b65f8ee 100644 --- a/include/cli_suggest.php +++ b/include/cli_suggest.php @@ -5,18 +5,15 @@ require_once('include/cli_startup.php'); require_once('include/socgraph.php'); -function cli_suggest_run($argv, $argc){ +function cli_suggest_run($argc,$argv){ cli_startup(); - - $a = get_app(); - update_suggestions(); } if (array_search(__file__,get_included_files())===0){ - cli_suggest_run($argv,$argc); + cli_suggest_run($argc,$argv); killme(); } diff --git a/include/cronhooks.php b/include/cronhooks.php index a314593d2..ae3806984 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -4,7 +4,7 @@ require_once('boot.php'); require_once('include/cli_startup.php'); -function cronhooks_run($argv, $argc){ +function cronhooks_run($argc,$argv){ cli_startup(); @@ -18,6 +18,6 @@ function cronhooks_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - cronhooks_run($argv,$argc); + cronhooks_run($argc,$argv); killme(); } diff --git a/include/deliver.php b/include/deliver.php index 40df543d5..12f28d6a9 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -5,7 +5,7 @@ require_once('include/zot.php'); require_once('include/queue_fn.php'); -function deliver_run($argv, $argc) { +function deliver_run($argc,$argv) { cli_startup(); @@ -82,6 +82,6 @@ function deliver_run($argv, $argc) { } if (array_search(__file__,get_included_files())===0){ - deliver_run($argv,$argc); + deliver_run($argc,$argv); killme(); } diff --git a/include/deliver_hooks.php b/include/deliver_hooks.php index f0d6ba1b1..f8f3bb19b 100644 --- a/include/deliver_hooks.php +++ b/include/deliver_hooks.php @@ -5,7 +5,7 @@ require_once('include/cli_startup.php'); require_once('include/zot.php'); -function deliver_hooks_run($argv, $argc) { +function deliver_hooks_run($argc,$argv) { cli_startup(); @@ -24,6 +24,6 @@ function deliver_hooks_run($argv, $argc) { } if (array_search(__file__,get_included_files())===0){ - deliver_hooks_run($argv,$argc); + deliver_hooks_run($argc,$argv); killme(); } diff --git a/include/directory.php b/include/directory.php index 8792a15e1..5120474a6 100644 --- a/include/directory.php +++ b/include/directory.php @@ -16,7 +16,7 @@ require_once('include/queue_fn.php'); * @param array $argv * @param array $argc */ -function directory_run($argv, $argc){ +function directory_run($argc,$argv){ cli_startup(); @@ -108,6 +108,6 @@ function directory_run($argv, $argc){ } if (array_search(__file__, get_included_files()) === 0) { - directory_run($argv, $argc); + directory_run($argc,$argv); killme(); } diff --git a/include/expire.php b/include/expire.php index e75594b5f..a2468e0f2 100644 --- a/include/expire.php +++ b/include/expire.php @@ -6,7 +6,7 @@ require_once('boot.php'); require_once('include/cli_startup.php'); -function expire_run($argv, $argc){ +function expire_run($argc,$argv){ cli_startup(); @@ -93,6 +93,6 @@ function expire_run($argv, $argc){ } if (array_search(__file__, get_included_files()) === 0){ - expire_run($argv, $argc); + expire_run($argc,$argv); killme(); } diff --git a/include/externals.php b/include/externals.php index 3a3a32420..ddf44dc52 100644 --- a/include/externals.php +++ b/include/externals.php @@ -5,7 +5,7 @@ require_once('include/cli_startup.php'); require_once('include/zot.php'); require_once('include/identity.php'); -function externals_run($argv, $argc){ +function externals_run($argc,$argv){ cli_startup(); $a = get_app(); @@ -98,6 +98,6 @@ function externals_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - externals_run($argv,$argc); + externals_run($argc,$argv); killme(); } diff --git a/include/gprobe.php b/include/gprobe.php index d8d893d9e..bd02ac31b 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -3,7 +3,7 @@ require_once('include/cli_startup.php'); require_once('include/zot.php'); -function gprobe_run($argv, $argc){ +function gprobe_run($argc,$argv){ cli_startup(); @@ -33,6 +33,6 @@ function gprobe_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - gprobe_run($argv,$argc); + gprobe_run($argc,$argv); killme(); } diff --git a/include/importdoc.php b/include/importdoc.php index 90dfb2fc4..7c65037d3 100755 --- a/include/importdoc.php +++ b/include/importdoc.php @@ -5,7 +5,7 @@ require_once('include/cli_startup.php'); -function importdoc_run($argv, $argc){ +function importdoc_run($argc,$argv){ cli_startup(); @@ -16,7 +16,7 @@ function importdoc_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - importdoc_run($argv,$argc); + importdoc_run($argc,$argv); killme(); } diff --git a/include/notifier.php b/include/notifier.php index 708d42bd0..780a8798c 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -74,7 +74,7 @@ require_once('include/bbcode.php'); require_once('include/identity.php'); require_once('include/Contact.php'); -function notifier_run($argv, $argc){ +function notifier_run($argc,$argv){ cli_startup(); @@ -659,6 +659,6 @@ function notifier_run($argv, $argc){ if (array_search(__file__,get_included_files())===0){ - notifier_run($argv,$argc); + notifier_run($argc,$argv); killme(); } diff --git a/include/onedirsync.php b/include/onedirsync.php index ce516da9d..d794fe35e 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -6,7 +6,7 @@ require_once('include/zot.php'); require_once('include/dir_fns.php'); -function onedirsync_run($argv, $argc){ +function onedirsync_run($argc,$argv){ cli_startup(); @@ -77,6 +77,6 @@ function onedirsync_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - onedirsync_run($argv,$argc); + onedirsync_run($argc,$argv); killme(); } diff --git a/include/onepoll.php b/include/onepoll.php index fedeb1e95..bfd79feea 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -7,7 +7,7 @@ require_once('include/socgraph.php'); require_once('include/Contact.php'); -function onepoll_run($argv, $argc){ +function onepoll_run($argc,$argv){ cli_startup(); @@ -154,6 +154,6 @@ function onepoll_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - onepoll_run($argv,$argc); + onepoll_run($argc,$argv); killme(); } diff --git a/include/poller.php b/include/poller.php index 808b54ee5..1a5b8508c 100644 --- a/include/poller.php +++ b/include/poller.php @@ -4,7 +4,7 @@ require_once('boot.php'); require_once('include/cli_startup.php'); -function poller_run($argv, $argc){ +function poller_run($argc,$argv){ cli_startup(); @@ -440,6 +440,6 @@ function poller_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - poller_run($argv,$argc); + poller_run($argc,$argv); killme(); } diff --git a/include/queue.php b/include/queue.php index 8a3b2aa58..1159e01a0 100644 --- a/include/queue.php +++ b/include/queue.php @@ -4,7 +4,7 @@ require_once('include/cli_startup.php'); require_once('include/queue_fn.php'); require_once('include/zot.php'); -function queue_run($argv, $argc){ +function queue_run($argc,$argv){ cli_startup(); @@ -90,6 +90,6 @@ function queue_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - queue_run($argv,$argc); + queue_run($argc,$argv); killme(); } diff --git a/include/ratenotif.php b/include/ratenotif.php index 2c636c710..3a5e515ae 100644 --- a/include/ratenotif.php +++ b/include/ratenotif.php @@ -5,7 +5,7 @@ require_once('include/zot.php'); require_once('include/queue_fn.php'); -function ratenotif_run($argv, $argc){ +function ratenotif_run($argc,$argv){ cli_startup(); @@ -114,6 +114,6 @@ function ratenotif_run($argv, $argc){ } if (array_search(__file__,get_included_files())===0){ - ratenotif_run($argv,$argc); + ratenotif_run($argc,$argv); killme(); } diff --git a/util/po2php.php b/util/po2php.php index 66807083b..ab8c495f9 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -1,7 +1,7 @@ <?php -function po2php_run($argv, $argc) { +function po2php_run($argc,$argv) { if ($argc!=2) { print "Usage: ".$argv[0]." <file.po>\n\n"; @@ -140,5 +140,5 @@ function trim_message($str) { } if (array_search(__file__,get_included_files())===0){ - po2php_run($argv,$argc); + po2php_run($argc,$argv); } |