Browse Source

[various] Remove remaining mentions of App->argc/argv

- The property has been removed in the core
pull/1158/head
Hypolite Petovan 4 months ago
parent
commit
d26a1db790
  1. 4
      saml/saml.php
  2. 14
      tictac/tictac.php
  3. 28
      widgets/widgets.php

4
saml/saml.php

@ -25,7 +25,7 @@ function saml_module($a)
function saml_init($a)
{
if ($a->argc < 2) {
if (DI::args()->getArgc() < 2) {
return;
}
@ -34,7 +34,7 @@ function saml_init($a)
return;
}
switch ($a->argv[1]) {
switch (DI::args()->get(1)) {
case 'metadata.xml':
saml_metadata();
break;

14
tictac/tictac.php

@ -30,16 +30,16 @@ function tictac_content(&$a) {
$o = '';
if($_POST['move']) {
$handicap = $a->argv[1];
$mefirst = $a->argv[2];
$dimen = $a->argv[3];
$yours = $a->argv[4];
$mine = $a->argv[5];
$handicap = DI::args()->get(1);
$mefirst = DI::args()->get(2);
$dimen = DI::args()->get(3);
$yours = DI::args()->get(4);
$mine = DI::args()->get(5);
$yours .= $_POST['move'];
}
elseif($a->argc > 1) {
$handicap = $a->argv[1];
elseif(DI::args()->getArgc() > 1) {
$handicap = DI::args()->get(1);
$dimen = 3;
}
else {

28
widgets/widgets.php

@ -82,7 +82,7 @@ function _randomAlphaNum($length){
function widgets_content(&$a) {
if (!isset($_GET['k'])) {
if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
if(DI::args()->get(2)=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
return;
}
@ -90,7 +90,7 @@ function widgets_content(&$a) {
DBA::escape($_GET['k'])
);
if (!count($r)){
if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
if(DI::args()->get(2)=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
return;
}
$conf = [];
@ -99,11 +99,11 @@ function widgets_content(&$a) {
$o = "";
$widgetfile =dirname(__file__)."/widget_".$a->argv[1].".php";
$widgetfile =dirname(__file__)."/widget_".DI::args()->get(1).".php";
if (file_exists($widgetfile)){
require_once($widgetfile);
} else {
if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
if(DI::args()->get(2)=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
return;
}
@ -111,9 +111,9 @@ function widgets_content(&$a) {
//echo "<pre>"; var_dump($a->argv); die();
if ($a->argv[2]=="cb"){
if (DI::args()->get(2)=="cb"){
/*header('Access-Control-Allow-Origin: *');*/
$o .= call_user_func($a->argv[1].'_widget_content',$a, $conf);
$o .= call_user_func(DI::args()->get(1).'_widget_content',$a, $conf);
} else {
@ -123,8 +123,8 @@ function widgets_content(&$a) {
$o .= "<h1>Preview Widget</h1>";
$o .= '<a href="'.DI::baseUrl()->get().'/settings/addon">'. DI::l10n()->t("Addon Settings") .'</a>';
$o .= "<h4>".call_user_func($a->argv[1].'_widget_name')."</h4>";
$o .= call_user_func($a->argv[1].'_widget_help');
$o .= "<h4>".call_user_func(DI::args()->get(1).'_widget_name')."</h4>";
$o .= call_user_func(DI::args()->get(1).'_widget_help');
$o .= "<br style='clear:left'/><br/>";
$o .= "<script>";
} else {
@ -133,23 +133,23 @@ function widgets_content(&$a) {
$widget_size = call_user_func($a->argv[1].'_widget_size');
$widget_size = call_user_func(DI::args()->get(1).'_widget_size');
$script = file_get_contents(dirname(__file__)."/widgets.js");
$o .= Renderer::replaceMacros($script, [
'$entrypoint' => DI::baseUrl()->get()."/widgets/".$a->argv[1]."/cb/",
'$entrypoint' => DI::baseUrl()->get()."/widgets/".DI::args()->get(1)."/cb/",
'$key' => $conf['key'],
'$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
'$widget_id' => 'f9a_'.DI::args()->get(1)."_"._randomAlphaNum(6),
'$loader' => DI::baseUrl()->get()."/images/rotator.gif",
'$args' => (isset($_GET['a'])?$_GET['a']:''),
'$width' => $widget_size[0],
'$height' => $widget_size[1],
'$type' => $a->argv[1],
'$type' => DI::args()->get(1),
]);
if (isset($_GET['p'])) {
$wargs = call_user_func($a->argv[1].'_widget_args');
$wargs = call_user_func(DI::args()->get(1).'_widget_args');
$jsargs = implode("</em>,<em>", $wargs);
if ($jsargs!='') $jsargs = "&a=<em>".$jsargs."</em>";
@ -158,7 +158,7 @@ function widgets_content(&$a) {
<h4>Copy and paste this code</h4>
<code>"
.htmlspecialchars('<script src="'.DI::baseUrl()->get().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
.htmlspecialchars('<script src="'.DI::baseUrl()->get().'/widgets/'.DI::args()->get(1).'?k='.$conf['key'])
.$jsargs
.htmlspecialchars('"></script>')
."</code>";

Loading…
Cancel
Save