diff --git a/php/.gitattributes b/php/.gitattributes index a6344aac8c09253b3b630fb776ae94478aa0275b..a865195d2e303a300fcd3348b1aa7228c5b96eb9 100644 --- a/php/.gitattributes +++ b/php/.gitattributes @@ -1,3 +1,4 @@ +<<<<<<< HEAD *.7z filter=lfs diff=lfs merge=lfs -text *.arrow filter=lfs diff=lfs merge=lfs -text *.bin filter=lfs diff=lfs merge=lfs -text @@ -33,3 +34,40 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text *tfevents* filter=lfs diff=lfs merge=lfs -text +======= +*.7z filter=lfs diff=lfs merge=lfs -text +*.arrow filter=lfs diff=lfs merge=lfs -text +*.bin filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.ckpt filter=lfs diff=lfs merge=lfs -text +*.ftz filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.h5 filter=lfs diff=lfs merge=lfs -text +*.joblib filter=lfs diff=lfs merge=lfs -text +*.lfs.* filter=lfs diff=lfs merge=lfs -text +*.mlmodel filter=lfs diff=lfs merge=lfs -text +*.model filter=lfs diff=lfs merge=lfs -text +*.msgpack filter=lfs diff=lfs merge=lfs -text +*.npy filter=lfs diff=lfs merge=lfs -text +*.npz filter=lfs diff=lfs merge=lfs -text +*.onnx filter=lfs diff=lfs merge=lfs -text +*.ot filter=lfs diff=lfs merge=lfs -text +*.parquet filter=lfs diff=lfs merge=lfs -text +*.pb filter=lfs diff=lfs merge=lfs -text +*.pickle filter=lfs diff=lfs merge=lfs -text +*.pkl filter=lfs diff=lfs merge=lfs -text +*.pt filter=lfs diff=lfs merge=lfs -text +*.pth filter=lfs diff=lfs merge=lfs -text +*.rar filter=lfs diff=lfs merge=lfs -text +*.safetensors filter=lfs diff=lfs merge=lfs -text +saved_model/**/* filter=lfs diff=lfs merge=lfs -text +*.tar.* filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text +*.tflite filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.wasm filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text +*tfevents* filter=lfs diff=lfs merge=lfs -text +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd diff --git a/php/Dockerfile b/php/Dockerfile index 4195c9f5db1ca6793a651d7fc0382e1509b77334..fbf2cc959068dfee51f2fba32eb029fa1eb9f03c 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Use the official phpMyAdmin image # Use the official phpMyAdmin image FROM phpmyadmin/phpmyadmin:latest @@ -15,3 +16,22 @@ ENV APACHE_PORT=7860 # Add test.php to the phpMyAdmin root directory +======= +# Use the official phpMyAdmin image +# Use the official phpMyAdmin image +FROM phpmyadmin/phpmyadmin:latest +RUN chmod -R 777 /var/ +RUN chmod -R 777 /etc/phpmyadmin/ +RUN chmod -R 777 /etc/apache2/ +# Set correct permissions for phpMyAdmin configuration file +RUN chmod 644 /etc/phpmyadmin/config.inc.php +COPY test.php /var/www/html/test.php +# Set environment variables +ENV PMA_HOST=mysql-7364790-localbugtv.l.aivencloud.com +ENV PMA_PORT=10490 +ENV MYSQL_ROOT_PASSWORD=root +ENV APACHE_PORT=7860 +# Add test.php to the phpMyAdmin root directory + + +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd diff --git a/php/README.md b/php/README.md index 1a2196b16ed5319227bb3c927e9da45f63162c18..0498c201258fe1144ef549683d0e60373ef89ec0 100644 --- a/php/README.md +++ b/php/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD --- title: php emoji: 🚀 @@ -8,3 +9,15 @@ pinned: false --- Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference +======= +--- +title: php +emoji: 🚀 +colorFrom: blue +colorTo: blue +sdk: docker +pinned: false +--- + +Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd diff --git a/php/admin_comments_edit.php b/php/admin_comments_edit.php index 9e90ddb64a6c46ca910a19184645f525e3c3a7a5..2c9356c27d49bc096ae1971d29ec5e258a33b8c4 100644 --- a/php/admin_comments_edit.php +++ b/php/admin_comments_edit.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD isLockingRequest() ) $pageObject->init(); $pageObject->process(); +======= +isLockingRequest() ) +{ + $pageObject->doLockingAction(); + exit(); +} + +$pageObject->init(); + +$pageObject->process(); +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd ?> \ No newline at end of file diff --git a/php/admin_comments_list.php b/php/admin_comments_list.php index 1ef2b35749801533b91f4d0103d2082e05e6c121..c983f7d8983dbd52d95b8e7cb70fc67e7bbbecd4 100644 --- a/php/admin_comments_list.php +++ b/php/admin_comments_list.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD prepareForBuildPage(); // show page depends of mode $pageObject->showPage(); +======= +processSaveSearch() ) + exit(); + +if( $pageObject->updateRowOrder() ) + exit(); + +if ( $pageObject->processFieldFilter() ) + exit(); + +if( $pageObject->processTotals() ) + exit(); + +if( $mode != LIST_DETAILS && $mode != MAP_DASHBOARD && $mode != LIST_DASHBOARD ) +{ + //maps +} + +unset($_SESSION["message_add"]); +unset($_SESSION["message_edit"]); + +// prepare code for build page +$pageObject->prepareForBuildPage(); + +// show page depends of mode +$pageObject->showPage(); + +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd ?> \ No newline at end of file diff --git a/php/admin_comments_search.php b/php/admin_comments_search.php index 64c05f34cc7750d192966e3ad0a2ae308fae6d61..55486da78d2575c43a8dfbdd3200f64dada01b43 100644 --- a/php/admin_comments_search.php +++ b/php/admin_comments_search.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD init(); $pageObject->process(); +======= +displaySearchControl(); + return; +} + +$pageObject->init(); +$pageObject->process(); +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd ?> \ No newline at end of file diff --git a/php/autocomplete.php b/php/autocomplete.php index 2d3f8fb3f90c9b0f43cee2585fead2f5aa8ac3b4..aad6526279736bac68a557c201b1871f2f511048 100644 --- a/php/autocomplete.php +++ b/php/autocomplete.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD getControl( $field ); + + +$contextParams = array(); +$contextParams["data"] = my_json_decode( postvalue('data') ); + +$masterTable = postvalue('masterTable'); +if ( $masterTable != "" && isset($_SESSION[ $masterTable . "_masterRecordData" ] ) || postvalue('masterData') ) +{ + $masterData = $_SESSION[ $masterTable . "_masterRecordData" ]; + if( !is_array($masterData) ) { + $masterData = array(); + } + $masterControlsData = my_json_decode( postvalue('masterData') ); + foreach( $masterControlsData as $mField => $mValue ) + { + $masterData[ $mField ] = $mValue; + } + + $contextParams["masterData"] = $masterData; +} + +RunnerContext::push( new RunnerContextItem( CONTEXT_ROW, $contextParams ) ); + + +$parentCtrlsData = my_json_decode( postvalue('parentCtrlsData') ); +$isExistParent = postvalue('isExistParent'); +$mode = intval( postvalue('mode') ); + +$respObj = array( 'success' => true, 'data' => $control->getLookupContentToReload( $isExistParent === '1', $mode, $parentCtrlsData ) ); +echo printJSON( $respObj ); + +RunnerContext::pop(); +exit(); +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd ?> \ No newline at end of file diff --git a/php/autofillfields.php b/php/autofillfields.php index ee453624e2dbae18c5dc7b100543903f0c4095d8..e1550aeb6aeee493fa0a294155f8b63267988491 100644 --- a/php/autofillfields.php +++ b/php/autofillfields.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD true, 'data' => $control->getAutoFillData( $l RunnerContext::pop(); exit(); +======= +getControl( $mainField ); + + +$contextParams = array(); +$contextParams["data"] = my_json_decode( postvalue('data') ); + +$masterTable = postvalue('masterTable'); +if ( $masterTable != "" && isset($_SESSION[ $masterTable . "_masterRecordData" ]) ) + $contextParams["masterData"] = $_SESSION[ $masterTable . "_masterRecordData" ]; + +RunnerContext::push( new RunnerContextItem( CONTEXT_ROW, $contextParams ) ); + +echo printJSON( array( 'success'=> true, 'data' => $control->getAutoFillData( $linkFieldVal ) ) ); + +RunnerContext::pop(); +exit(); +>>>>>>> acd181a7002882ac681210d3324239e51441c5bd ?> \ No newline at end of file diff --git a/php/buildpdf.php b/php/buildpdf.php index c1ba4e077e0d564ba539e49cde6d4aed76817c38..41a8733b3dc4fc9ebaa8ff4e1ee46ce417767ef9 100644 --- a/php/buildpdf.php +++ b/php/buildpdf.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD
+ + + ++======= + + + +
+
+ +
+>>>>>>> acd181a7002882ac681210d3324239e51441c5bd