From 2f46112f24369794d841f1895a49ee8cbdb3b9f9 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 1 Oct 2014 13:52:12 +0530
Subject: [PATCH 1/2] Disable new link when there is no privilege to create
 procedure

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/rte/rte_footer.lib.php       |  19 +++++++++++++------
 themes/original/img/bd_routine_add.png | Bin 0 -> 372 bytes
 themes/pmahomme/img/bd_routine_add.png | Bin 0 -> 372 bytes
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 themes/original/img/bd_routine_add.png
 create mode 100644 themes/pmahomme/img/bd_routine_add.png

diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php
index 415f0164a5..2b3a9917b7 100644
--- a/libraries/rte/rte_footer.lib.php
+++ b/libraries/rte/rte_footer.lib.php
@@ -25,17 +25,24 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name)
     /** @var PMA_String $pmaString */
     $pmaString = $GLOBALS['PMA_String'];
 
-    $icon = 'b_' . $pmaString->strtolower($name) . '_add.png';
     $retval  = "";
     $retval .= "<!-- ADD " . $name . " FORM START -->\n";
     $retval .= "<fieldset class='left'>\n";
     $retval .= "<legend>" . _pgettext('Create new procedure', 'New') . "</legend>\n";
     $retval .= "        <div class='wrap'>\n";
-    $retval .= "            <a {$ajax_class['add']} ";
-    $retval .= "href='db_" . $pmaString->strtolower($name) . "s.php";
-    $retval .= "?$url_query&amp;add_item=1' onclick='$.datepicker.initialized = false;'>";
-    $retval .= PMA_Util::getIcon($icon);
-    $retval .= PMA_RTE_getWord('add') . "</a>\n";
+    if (PMA_Util::currentUserHasPrivilege($priv, $db)) {
+        $retval .= "            <a {$ajax_class['add']} ";
+        $retval .= "href='db_" . $pmaString->strtolower($name) . "s.php";
+        $retval .= "?$url_query&amp;add_item=1' ";
+        $retval .= "onclick='$.datepicker.initialized = false;'>";
+        $icon = 'b_' . $pmaString->strtolower($name) . '_add.png';
+        $retval .= PMA_Util::getIcon($icon);
+        $retval .= PMA_RTE_getWord('add') . "</a>\n";
+    } else {
+        $icon = 'bd_' . $pmaString->strtolower($name) . '_add.png';
+        $retval .= PMA_Util::getIcon($icon);
+        $retval .= PMA_RTE_getWord('add'). "\n";
+    }
     $retval .= "            " . PMA_Util::showMySQLDocu($docu) . "\n";
     $retval .= "        </div>\n";
     $retval .= "</fieldset>\n";
diff --git a/themes/original/img/bd_routine_add.png b/themes/original/img/bd_routine_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..91ec8e1f5fef28b1facaa26920c3319040cec921
GIT binary patch
literal 372
zcmV-)0gL{LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003yNkl<Zc-o~>
z!D@p*6pZ~dKSC1&`2x{{UPJ=o(RlafMF@y7m;8iy@&`(a`2fLss5Iczks4YGRmsBg
zn78|8-oDw@YUc7h58Q{t0js6Uahw-T(@<3vbX^DWl6pZD#ja@@bX^BVV&*3+*)Emq
zx<;C&cf&9~8Ht(alO_q+HkD1&yi=8tnE6=*Pj#?(22>pF8guLQ8nP^7bb*n0v)SN}
zRkUclM9ku%C~&*o9>m<l%#-NfHYG{w%Cbb;wzym_@O>Yy>%y`u9FIrveE4BggNmXE
zVHhIMb6l@i-ot*s=QG|0f+?$P+eVgU0|D3Rbi(<3#&)~?nAL%*s*mDvk+3J2H-p`7
zha^c5$MI0i$Y&^u^2-U~rwhcR3qcSJgChx*8Hss5`ycf2wO4#++f@Em7rp?YJ<v~p
SZCld-0000<MNUMnLSTZcyR7#B

literal 0
HcmV?d00001

diff --git a/themes/pmahomme/img/bd_routine_add.png b/themes/pmahomme/img/bd_routine_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..91ec8e1f5fef28b1facaa26920c3319040cec921
GIT binary patch
literal 372
zcmV-)0gL{LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003yNkl<Zc-o~>
z!D@p*6pZ~dKSC1&`2x{{UPJ=o(RlafMF@y7m;8iy@&`(a`2fLss5Iczks4YGRmsBg
zn78|8-oDw@YUc7h58Q{t0js6Uahw-T(@<3vbX^DWl6pZD#ja@@bX^BVV&*3+*)Emq
zx<;C&cf&9~8Ht(alO_q+HkD1&yi=8tnE6=*Pj#?(22>pF8guLQ8nP^7bb*n0v)SN}
zRkUclM9ku%C~&*o9>m<l%#-NfHYG{w%Cbb;wzym_@O>Yy>%y`u9FIrveE4BggNmXE
zVHhIMb6l@i-ot*s=QG|0f+?$P+eVgU0|D3Rbi(<3#&)~?nAL%*s*mDvk+3J2H-p`7
zha^c5$MI0i$Y&^u^2-U~rwhcR3qcSJgChx*8Hss5`ycf2wO4#++f@Em7rp?YJ<v~p
SZCld-0000<MNUMnLSTZcyR7#B

literal 0
HcmV?d00001


From ca59b4910b5b07657388b023e84a1625683f15ad Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 1 Oct 2014 14:04:30 +0530
Subject: [PATCH 2/2] Since editing a procedure involved dropping and
 recreating, check also for CREATE ROUTINE privilege to avoid lost procedures

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/rte/rte_list.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 61a110a51c..0df399e18c 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -147,7 +147,10 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
     $retval .= "                </strong>\n";
     $retval .= "            </td>\n";
     $retval .= "            <td>\n";
+    // Since editing a procedure involved dropping and recreating, check also for
+    // CREATE ROUTINE privilege to avoid lost procedures.
     if ($routine['ROUTINE_DEFINITION'] !== null
+        && PMA_Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
     ) {
         $retval .= '                <a ' . $ajax_class['edit']
                                          . ' href="db_routines.php?'