replaced XoopsConfirm

ggoffy · ggoffy · commit b82f1ff38ed0 · 2022-01-02T16:19:01.000+01:00
diff --git a/admin/modules.php b/admin/modules.php
@@ -230,12 +230,12 @@
                 $GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors());
             }
         } else {
-            $xoopsconfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+            $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
                 ['ok' => 1, 'mod_id' => $modId, 'op' => 'delete'],
                 \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'),
                 $modulesObj->getVar('mod_name')
             );
-            $form         = $xoopsconfirm->getFormConfirm();
+            $form         = $customConfirm->getFormConfirm();
             $GLOBALS['xoopsTpl']->assign('form', $form->render());
         }
         break;
diff --git a/admin/morefiles.php b/admin/morefiles.php
@@ -134,10 +134,10 @@
                 $GLOBALS['xoopsTpl']->assign('error', $morefilesObj->getHtmlErrors());
             }
         } else {
-            $xoopsconfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+            $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
                 ['ok' => 1, 'file_id' => $fileId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $morefilesObj->getVar('file_name')
             );
-            $form         = $xoopsconfirm->getFormConfirm();
+            $form         = $customConfirm->getFormConfirm();
             $GLOBALS['xoopsTpl']->assign('form', $form->render());
         }
         break;
diff --git a/admin/settings.php b/admin/settings.php
@@ -170,10 +170,10 @@
                 $GLOBALS['xoopsTpl']->assign('error', $settingsObj->getHtmlErrors());
             }
         } else {
-            $xoopsconfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+            $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
                 ['ok' => 1, 'set_id' => $setId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $settingsObj->getVar('set_name')
             );
-            $form         = $xoopsconfirm->getFormConfirm();
+            $form         = $customConfirm->getFormConfirm();
             $GLOBALS['xoopsTpl']->assign('form', $form->render());
         }
         break;
diff --git a/admin/tables.php b/admin/tables.php
@@ -272,10 +272,10 @@
                 $GLOBALS['xoopsTpl']->assign('error', $tablesObj->getHtmlErrors());
             }
         } else {
-            $xoopsconfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+            $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
                 ['ok' => 1, 'table_id' => $tableId, 'table_mid' => $tableMid, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $tablesObj->getVar('table_name')
             );
-            $form         = $xoopsconfirm->getFormConfirm();
+            $form         = $customConfirm->getFormConfirm();
             $GLOBALS['xoopsTpl']->assign('form', $form->render());
         }
         break;
diff --git a/class/Common/Confirm.php b/class/Common/Confirm.php
@@ -24,12 +24,12 @@
  *
  *
  * Example:
-    $xoopsconfirm = new Common\Confirm(
+    $customConfirm = new Common\Confirm(
         ['ok' => 1, 'item_id' => $itemId, 'op' => 'delete'],
         $_SERVER['REQUEST_URI'],
         \sprintf(\_MA_MYMODULE_FORM_SURE_DELETE,
         $itemsObj->getCaption()));
-    $form = $xoopsconfirm->getFormConfirm();
+    $form = $customConfirm->getFormConfirm();
     $GLOBALS['xoopsTpl']->assign('form', $form->render());
  */
 
diff --git a/class/Files/CreateXoopsCode.php b/class/Files/CreateXoopsCode.php
@@ -1042,8 +1042,8 @@ public function getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, $
         $confirm .= $t . "\t" . $array . ",\n";
         $confirm .= $t . "\t" . $server . ",\n";
         $confirm .= $t . "\t" . $sprintf . ')';
-        $ret     = $xc->getXcEqualsOperator('$xoopsconfirm', $confirm, '', $t);
-        $ret     .= $xc->getXcEqualsOperator('$form', '$xoopsconfirm->getFormConfirm()', '', $t);
+        $ret     = $xc->getXcEqualsOperator('$customConfirm', $confirm, '', $t);
+        $ret     .= $xc->getXcEqualsOperator('$form', '$customConfirm->getFormConfirm()', '', $t);
         $ret     .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
         return $ret;
     }
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -14,6 +14,7 @@
 - code cleaning (PS inspect code) (goffy)
 - fixed bug in guests (goffy)
 - removed redundant params from Request (goffy)
+- replaced Common/XoopsConfirm by Common/Confirm(mamba/goffy)
 
 <h5>3.5.1 Beta 1   [NOT RELEASED]</h5>  Dev: XOOPS 2.5.11, PHP 7.4.25, PHP 8.0.12, PHP 8.1.0 Beta 4
  - semantic versioning (mamba)
diff --git a/files/commonfiles/class/Common/Confirm.php b/files/commonfiles/class/Common/Confirm.php
@@ -24,12 +24,12 @@
  *
  *
  * Example:
-    $xoopsconfirm = new Common\Confirm(
+    $customConfirm = new Common\Confirm(
         ['ok' => 1, 'item_id' => $itemId, 'op' => 'delete'],
         $_SERVER['REQUEST_URI'],
         \sprintf(\_MA_MYMODULE_FORM_SURE_DELETE,
         $itemsObj->getCaption()));
-    $form = $xoopsconfirm->getFormConfirm();
+    $form = $customConfirm->getFormConfirm();
     $GLOBALS['xoopsTpl']->assign('form', $form->render());
  */
 

Original file line number	Diff line number	Diff line change
`@@ -134,10 +134,10 @@`
`134`	`134`	`$GLOBALS['xoopsTpl']->assign('error', $morefilesObj->getHtmlErrors());`
`135`	`135`	`}`
`136`	`136`	`} else {`
`137`		`- $xoopsconfirm = new \XoopsModules\Modulebuilder\Common\Confirm(`
	`137`	`+ $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(`
`138`	`138`	`['ok' => 1, 'file_id' => $fileId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $morefilesObj->getVar('file_name')`
`139`	`139`	`);`
`140`		`- $form = $xoopsconfirm->getFormConfirm();`
	`140`	`+ $form = $customConfirm->getFormConfirm();`
`141`	`141`	`$GLOBALS['xoopsTpl']->assign('form', $form->render());`
`142`	`142`	`}`
`143`	`143`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,10 @@`
`170`	`170`	`$GLOBALS['xoopsTpl']->assign('error', $settingsObj->getHtmlErrors());`
`171`	`171`	`}`
`172`	`172`	`} else {`
`173`		`- $xoopsconfirm = new \XoopsModules\Modulebuilder\Common\Confirm(`
	`173`	`+ $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(`
`174`	`174`	`['ok' => 1, 'set_id' => $setId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $settingsObj->getVar('set_name')`
`175`	`175`	`);`
`176`		`- $form = $xoopsconfirm->getFormConfirm();`
	`176`	`+ $form = $customConfirm->getFormConfirm();`
`177`	`177`	`$GLOBALS['xoopsTpl']->assign('form', $form->render());`
`178`	`178`	`}`
`179`	`179`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -272,10 +272,10 @@`
`272`	`272`	`$GLOBALS['xoopsTpl']->assign('error', $tablesObj->getHtmlErrors());`
`273`	`273`	`}`
`274`	`274`	`} else {`
`275`		`- $xoopsconfirm = new \XoopsModules\Modulebuilder\Common\Confirm(`
	`275`	`+ $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(`
`276`	`276`	`['ok' => 1, 'table_id' => $tableId, 'table_mid' => $tableMid, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $tablesObj->getVar('table_name')`
`277`	`277`	`);`
`278`		`- $form = $xoopsconfirm->getFormConfirm();`
	`278`	`+ $form = $customConfirm->getFormConfirm();`
`279`	`279`	`$GLOBALS['xoopsTpl']->assign('form', $form->render());`
`280`	`280`	`}`
`281`	`281`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@`
`24`	`24`	`*`
`25`	`25`	`*`
`26`	`26`	`* Example:`
`27`		`- $xoopsconfirm = new Common\Confirm(`
	`27`	`+ $customConfirm = new Common\Confirm(`
`28`	`28`	`['ok' => 1, 'item_id' => $itemId, 'op' => 'delete'],`
`29`	`29`	`$_SERVER['REQUEST_URI'],`
`30`	`30`	`\sprintf(\_MA_MYMODULE_FORM_SURE_DELETE,`
`31`	`31`	`$itemsObj->getCaption()));`
`32`		`- $form = $xoopsconfirm->getFormConfirm();`
	`32`	`+ $form = $customConfirm->getFormConfirm();`
`33`	`33`	`$GLOBALS['xoopsTpl']->assign('form', $form->render());`
`34`	`34`	`*/`
`35`	`35`