From: Jehan-Guillaume (ioguix) de Rorthais Date: Fri, 17 Aug 2012 12:38:50 +0000 (+0200) Subject: Remove the report feature from PPA (will be a plugin) X-Git-Tag: REL_5-1-0~53 X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=826efbbec4927d1a72974e1ea8b6df95c07063d0;p=phppgadmin.git Remove the report feature from PPA (will be a plugin) Starting with PPA 5.1, Reports will be available as plugins. --- diff --git a/INSTALL b/INSTALL index 75d6e338..56c202a6 100644 --- a/INSTALL +++ b/INSTALL @@ -24,13 +24,7 @@ phpPgAdmin Installation Guide If you mess up the configuration file, you can recover it from the config.inc.php-dist file. -3. Set up the reports database. - - If you want to enable reports (which are a useful feature) then go to - the 'sql' subdirectory and view the SQL script for your database. It - will contain instructions on how to set up the reports database. - -4. If you run your PHP installation in safe mode, in order that the database +3. If you run your PHP installation in safe mode, in order that the database dump feature can work correctly, you need to set the 'safe_mode_allowed_env_vars' php.ini variable to include the PGPASSWORD and PGUSER environmental variables and the safe_mode_exec_dir to include /usr/bin (or wherever the pg_dump @@ -49,7 +43,7 @@ phpPgAdmin Installation Guide Lastly, if you run phpPgAdmin in safe mode, very long running imports, exports and transactions may time out and be aborted. -5. Enable the statistics collector in PostgreSQL. phpPgAdmin will display +4. Enable the statistics collector in PostgreSQL. phpPgAdmin will display table and index performance and usage statistics if you have enabled the PostgreSQL statistics collector. To enable the collector, uncomment the following lines in your postgresql.conf and enable them: @@ -59,10 +53,10 @@ phpPgAdmin Installation Guide stats_block_level = true stats_row_level = true -6. Browse to the phpPgAdmin installation using a web browser. You might +5. Browse to the phpPgAdmin installation using a web browser. You might need cookies enabled for phpPgAdmin to work. -7. IMPORTANT - SECURITY +6. IMPORTANT - SECURITY PostgreSQL by default does not require you to use a password to log in. We STRONGLY recomment that you enable md5 passwords for local connections diff --git a/classes/Misc.php b/classes/Misc.php index 0910fd04..504e7f26 100644 --- a/classes/Misc.php +++ b/classes/Misc.php @@ -67,15 +67,6 @@ 'subject' => 'server' )); break; - case 'report': - $vars = array( - 'url' => 'reports.php', - 'params' => array( - 'server' => $_REQUEST['server'], - 'subject' => 'report', - 'report' => $_REQUEST['report'] - )); - break; case 'role': $vars = array('params' => array( 'server' => $_REQUEST['server'], @@ -181,6 +172,16 @@ 'column' => $_REQUEST['column'] )); break; + // case 'plugin': + // $vars = array('params' => array( + // 'server' => $_REQUEST['server'], + // 'subject' => 'plugin', + // 'plugin' => $_REQUEST['plugin'], + // 'database' => $_REQUEST['database'], + // 'schema' => $_REQUEST['schema'], + // 'action' => $_REQUEST['action'] + // )); + // break; default: return false; } @@ -718,7 +719,6 @@ break; case 'server': - case 'report': $hide_users = !$data->isSuperUser(); $tabs = array ( 'databases' => array ( @@ -786,13 +786,6 @@ 'hide' => (!$this->isDumpEnabled()), 'icon' => 'Export', ), - 'reports' => array ( - 'title' => $lang['strreports'], - 'url' => 'reports.php', - 'urlvars' => array('subject' => 'server'), - 'hide' => !$conf['show_reports'], - 'icon' => 'Reports', - ), )); break; case 'database': @@ -1488,15 +1481,6 @@ } if ($subject == 'server') $done = true; - if (isset($_REQUEST['report']) && !$done) { - $trail['report'] = array( - 'title' => $lang['strreport'], - 'text' => $_REQUEST['report'], - 'url' => $this->getHREFSubject('report'), - 'icon' => 'Report' - ); - } - if (isset($_REQUEST['database']) && !$done) { $trail['database'] = array( 'title' => $lang['strdatabase'], @@ -1514,7 +1498,7 @@ 'icon' => 'Roles' ); } - if ($subject == 'database' || $subject == 'role' || $subject == 'report') $done = true; + if ($subject == 'database' || $subject == 'role') $done = true; if (isset($_REQUEST['schema']) && !$done) { $trail['schema'] = array( diff --git a/classes/Reports.php b/classes/Reports.php deleted file mode 100644 index 0688f35a..00000000 --- a/classes/Reports.php +++ /dev/null @@ -1,139 +0,0 @@ -reports_db = $conf['reports_db']; - } - if (isset($conf['reports_schema'])) { - $this->reports_schema = $conf['reports_schema']; - } - if (isset($conf['reports_table'])) { - $this->reports_table = $conf['reports_table']; - } - - // Check to see if the reports database exists - $rs = $data->getDatabase($this->reports_db); - if ($rs->recordCount() != 1) $status = -1; - else { - // Create a new database access object. - $this->driver = $misc->getDatabaseAccessor($this->reports_db); - // Reports database should have been created in public schema - $this->driver->setSchema($this->reports_schema); - $status = 0; - } - } - - /** - * Finds all reports - * @return A recordset - */ - function getReports() { - global $conf, $misc; - // Filter for owned reports if necessary - if ($conf['owned_reports_only']) { - $server_info = $misc->getServerInfo(); - $filter['created_by'] = $server_info['username']; - $ops = array('created_by' => '='); - } - else $filter = $ops = array(); - - $sql = $this->driver->getSelectSQL($this->reports_table, - array('report_id', 'report_name', 'db_name', 'date_created', 'created_by', 'descr', 'report_sql', 'paginate'), - $filter, $ops, array('db_name' => 'asc', 'report_name' => 'asc')); - - return $this->driver->selectSet($sql); - } - - /** - * Finds a particular report - * @param $report_id The ID of the report to find - * @return A recordset - */ - function getReport($report_id) { - $sql = $this->driver->getSelectSQL($this->reports_table, - array('report_id', 'report_name', 'db_name', 'date_created', 'created_by', 'descr', 'report_sql', 'paginate'), - array('report_id' => $report_id), array('report_id' => '='), array()); - - return $this->driver->selectSet($sql); - } - - /** - * Creates a report - * @param $report_name The name of the report - * @param $db_name The name of the database - * @param $descr The comment on the report - * @param $report_sql The SQL for the report - * @param $paginate The report should be paginated - * @return 0 success - */ - function createReport($report_name, $db_name, $descr, $report_sql, $paginate) { - global $misc; - $server_info = $misc->getServerInfo(); - $temp = array( - 'report_name' => $report_name, - 'db_name' => $db_name, - 'created_by' => $server_info['username'], - 'report_sql' => $report_sql, - 'paginate' => $paginate ? 'true' : 'false', - ); - if ($descr != '') $temp['descr'] = $descr; - - return $this->driver->insert($this->reports_table, $temp); - } - - /** - * Alters a report - * @param $report_id The ID of the report - * @param $report_name The name of the report - * @param $db_name The name of the database - * @param $descr The comment on the report - * @param $report_sql The SQL for the report - * @param $paginate The report should be paginated - * @return 0 success - */ - function alterReport($report_id, $report_name, $db_name, $descr, $report_sql, $paginate) { - global $misc; - $server_info = $misc->getServerInfo(); - $temp = array( - 'report_name' => $report_name, - 'db_name' => $db_name, - 'created_by' => $server_info['username'], - 'report_sql' => $report_sql, - 'paginate' => $paginate ? 'true' : 'false', - 'descr' => $descr - ); - - return $this->driver->update($this->reports_table, $temp, - array('report_id' => $report_id)); - } - - /** - * Drops a report - * @param $report_id The ID of the report to drop - * @return 0 success - */ - function dropReport($report_id) { - return $this->driver->delete($this->reports_table, array('report_id' => $report_id)); - } - - } -?> diff --git a/conf/config.inc.php-dist b/conf/config.inc.php-dist index ed553b1c..6b36d176 100644 --- a/conf/config.inc.php-dist +++ b/conf/config.inc.php-dist @@ -111,20 +111,6 @@ // Display "system" objects? $conf['show_system'] = false; - // Display reports feature? For this feature to work, you must - // install the reports database as explained in the INSTALL file. - $conf['show_reports'] = true; - - // Database and table for reports - $conf['reports_db'] = 'phppgadmin'; - $conf['reports_schema'] = 'public'; - $conf['reports_table'] = 'ppa_reports'; - - // Only show owned reports? - // Note: This does not prevent people from accessing other reports by - // other means. - $conf['owned_reports_only'] = false; - // Minimum length users can set their password to. $conf['min_password_length'] = 1; diff --git a/display.php b/display.php index dbeb2ecd..92496434 100644 --- a/display.php +++ b/display.php @@ -448,10 +448,6 @@ $misc->printTitle($lang['strselect']); $type = 'SELECT'; } - else if (isset($_REQUEST['report'])) { - $misc->printTitle($lang['strselect']); - $type = 'SELECT'; - } else { $misc->printTitle($lang['strbrowse']); $type = 'TABLE'; @@ -499,7 +495,6 @@ if (isset($object)) $gets .= "&" . urlencode($subject) . '=' . urlencode($object); if (isset($subject)) $gets .= "&subject=" . urlencode($subject); if (isset($_REQUEST['query'])) $gets .= "&query=" . urlencode($_REQUEST['query']); - if (isset($_REQUEST['report'])) $gets .= "&report=" . urlencode($_REQUEST['report']); if (isset($_REQUEST['count'])) $gets .= "&count=" . urlencode($_REQUEST['count']); if (isset($_REQUEST['return'])) $gets .= "&return=" . urlencode($_REQUEST['return']); if (isset($_REQUEST['search_path'])) $gets .= "&search_path=" . urlencode($_REQUEST['search_path']); @@ -515,7 +510,6 @@ if (isset($object)) $_gets[$subject] = $object; if (isset($subject)) $_gets['subject'] = $subject; if (isset($_REQUEST['query'])) $_gets['query'] = $_REQUEST['query']; - if (isset($_REQUEST['report'])) $_gets['report'] = $_REQUEST['report']; if (isset($_REQUEST['count'])) $_gets['count'] = $_REQUEST['count']; if (isset($_REQUEST['return'])) $_gets['return'] = $_REQUEST['return']; if (isset($_REQUEST['search_path'])) $_gets['search_path'] = $_REQUEST['search_path']; @@ -739,23 +733,6 @@ 'content' => $lang['strexpand'] ); - // Create report - if (isset($_REQUEST['query']) && ($subject !== 'report') && $conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) { - $navlinks['createreport'] = array ( - 'attr'=> array ( - 'href' => array ( - 'url' => 'reports.php', - 'urlvars' => array_merge($fields, array( - 'action' => 'create', - 'report_sql' => $_REQUEST['query'], - 'paginate' => isset($_REQUEST['paginate'])? $_REQUEST['paginate']:'f' - )) - ) - ), - 'content' => $lang['strcreatereport'] - ); - } - // Create view and download if (isset($_REQUEST['query']) && isset($rs) && is_object($rs) && $rs->recordCount() > 0) { diff --git a/images/themes/default/Report.png b/images/themes/default/Report.png deleted file mode 100644 index f9158b9a..00000000 Binary files a/images/themes/default/Report.png and /dev/null differ diff --git a/images/themes/default/Reports.png b/images/themes/default/Reports.png deleted file mode 100644 index 4a403e07..00000000 Binary files a/images/themes/default/Reports.png and /dev/null differ diff --git a/lang/afrikaans.php b/lang/afrikaans.php index 745776cc..fc5135d8 100644 --- a/lang/afrikaans.php +++ b/lang/afrikaans.php @@ -136,7 +136,6 @@ $lang['strnodata'] = 'Geen rye gevind.'; $lang['strnoobjects'] = 'Geen objekte gevind.'; $lang['strrownotunique'] = 'Geen unieke identifiseerder vir hierdie ry.'; - $lang['strnoreportsdb'] = 'Jy het nie die verslae-databasis geskep nie. Lees asb. die INSTALL-lêer vir instruksies.'; $lang['strnouploads'] = 'Oplaaiing van lêers is afgeskakel.'; $lang['strimporterror'] = 'Inleesfout.'; $lang['strimporterrorline'] = 'Inleesfout op reël %s.'; @@ -500,18 +499,6 @@ $lang['strsearchpath'] = 'Skema-soekpad'; // Reports - $lang['strreport'] = 'Verslag'; - $lang['strreports'] = 'Verslae'; - $lang['strshowallreports'] = 'Wys alle verslae'; - $lang['strnoreports'] = 'Geen verslae gevind.'; - $lang['strcreatereport'] = 'Skep verslag'; - $lang['strreportdropped'] = 'Verslag is verwyder.'; - $lang['strreportdroppedbad'] = 'Verwydering van verslag het misluk.'; - $lang['strconfdropreport'] = 'Is jy seker dat jy die verslag "%s" wil verwyder?'; - $lang['strreportneedsname'] = 'Jy moet \'n naam gee vir die verslag.'; - $lang['strreportneedsdef'] = 'Jy moet SQL-kode skryf vir die verslag.'; - $lang['strreportcreated'] = 'Verslag is geskep.'; - $lang['strreportcreatedbad'] = 'Die verslag kon nie geskep word nie.'; // Domains $lang['strdomain'] = 'Domein'; diff --git a/lang/arabic.php b/lang/arabic.php index 636c91a7..10d2637a 100644 --- a/lang/arabic.php +++ b/lang/arabic.php @@ -136,7 +136,6 @@ $lang['strloginfailed'] = 'لم تنجح عملية الدخول'; $lang['strnodata'] = 'لم توجد سجلات.'; $lang['strnoobjects'] = 'لم توجد كائنات.'; $lang['strrownotunique'] = 'لا يوجد معرّف فريد unique identifier في هذا السجل.'; - $lang['strnoreportsdb'] = 'لم تقم بإنشاء قاعدة بيانات التقارير reports database. إقرأ التعليمات في المف INSTALL.'; $lang['strnouploads'] = 'تحميل الملفات غير مفعّل.'; $lang['strimporterror'] = 'خطأ في الإستيراد.'; $lang['strimporterrorline'] = 'خطأ في الإستيراد عند السطر: %s.'; @@ -479,18 +478,6 @@ $lang['strloginfailed'] = 'لم تنجح عملية الدخول'; $lang['strschemaalteredbad'] = 'فشلت عملية تعديل المخطط، لم يتم التعديل.'; // Reports - $lang['strreport'] = 'تقرير Report'; - $lang['strreports'] = 'تقارير Reports'; - $lang['strshowallreports'] = 'عرض جميع التقارير'; - $lang['strnoreports'] = 'لم توجد تقارير.'; - $lang['strcreatereport'] = 'إنشاء تقرير جديد'; - $lang['strreportdropped'] = 'تم حذف التقرير.'; - $lang['strreportdroppedbad'] = 'فشلت عملية حذف التقرير.'; - $lang['strconfdropreport'] = 'هل أنت متأكد تريد حذف التقرير "%s"؟'; - $lang['strreportneedsname'] = 'يجب إعطاء اسم للتقرير.'; - $lang['strreportneedsdef'] = 'يجب كتابة عبارة SQL للتقرير.'; - $lang['strreportcreated'] = 'تم حفظ التقرير.'; - $lang['strreportcreatedbad'] = 'لم يتم حفظ التقرير، لقد فشلت عملية الحفظ.'; // Domains $lang['strdomain'] = 'نطاق Domain'; diff --git a/lang/catalan.php b/lang/catalan.php index d478fad3..8004e368 100644 --- a/lang/catalan.php +++ b/lang/catalan.php @@ -186,7 +186,6 @@ $lang['strnodata'] = 'No s\'han trobat files.'; $lang['strnoobjects'] = 'No s\'han trobat objectes.'; $lang['strrownotunique'] = 'No hi ha un identificador únic per aquesta fila.'; - $lang['strnoreportsdb'] = 'La base de dades dels reports no està creada. Llegeixi el fitxer INSTALL per fer-ho.'; $lang['strnouploads'] = 'La pujada de fitxers està deshabilitada.'; $lang['strimporterror'] = 'Error d\'importació.'; $lang['strimporterror-fileformat'] = 'Error d\'importació: Error al determinar automàticament el format del fitxer.'; @@ -659,18 +658,6 @@ $lang['strspecifyschematodrop'] = 'Ha d\especificar almenys un esquema per eliminar.'; // Reports - $lang['strreport'] = 'Report'; - $lang['strreports'] = 'Reports'; - $lang['strshowallreports'] = 'Mostra tots els reports'; - $lang['strnoreports'] = 'No s\'han trobat reports'; - $lang['strcreatereport'] = 'Crea un report'; - $lang['strreportdropped'] = 'Report eliminat.'; - $lang['strreportdroppedbad'] = 'No s\'ha pogut eliminar el report.'; - $lang['strconfdropreport'] = 'Està segur de voler eliminar el report "%s"?'; - $lang['strreportneedsname'] = 'Ha de donar un nom al report.'; - $lang['strreportneedsdef'] = 'Ha de donar un SQL al report.'; - $lang['strreportcreated'] = 'Report desat.'; - $lang['strreportcreatedbad'] = 'No s\'ha pogut desar el report.'; // Domains $lang['strdomain'] = 'Domini'; diff --git a/lang/chinese-sim.php b/lang/chinese-sim.php index 341bc57f..173e92dd 100644 --- a/lang/chinese-sim.php +++ b/lang/chinese-sim.php @@ -349,17 +349,6 @@ $lang['strnotype'] = '查无此类型'; $lang['strtypename'] = '类型名称'; $lang['strnoschema'] = '查无此模式'; $lang['strschemaname'] = '模式名称'; -$lang['strreport'] = '报表'; -$lang['strreports'] = '报表'; -$lang['strshowallreports'] = '显示所有报表'; -$lang['strnoreports'] = '查无此报表'; -$lang['strcreatereport'] = '创建报表'; -$lang['strreportdropped'] = '创建报表完成.'; -$lang['strreportdroppedbad'] = '删除报表失败'; -$lang['strconfdropreport'] = '您确定要删除报表"%s"么？'; -$lang['strreportneedsname'] = '你必须给您的报表命名'; -$lang['strreportcreated'] = '储存报表完成'; -$lang['strreportcreatedbad'] = '储存报表失败'; diff --git a/lang/chinese-tr.php b/lang/chinese-tr.php index 3c8773b9..1fe2bd6b 100644 --- a/lang/chinese-tr.php +++ b/lang/chinese-tr.php @@ -134,7 +134,6 @@ $lang['strnodata'] = '找不到任何資料列。'; $lang['strnoobjects'] = '找不到任何物件。'; $lang['strrownotunique'] = '此顯料列無獨特識別項。'; - $lang['strnoreportsdb'] = '您尚未建新報表資料庫，請參閱INSTALL檔說明。'; $lang['strnouploads'] = '上傳檔案功能已停用。'; $lang['strimporterror'] = '匯入錯誤。'; $lang['strimporterrorline'] = '匯入錯誤發生於第 %s 行。'; @@ -481,18 +480,6 @@ $lang['strschemaalteredbad'] = '修改模式失敗。'; // Reports - $lang['strreport'] = '報表'; - $lang['strreports'] = '報表'; - $lang['strshowallreports'] = '顯示所有的報表'; - $lang['strnoreports'] = '找不到此報表。'; - $lang['strcreatereport'] = '建立新報表'; - $lang['strreportdropped'] = '成功刪除報表。'; - $lang['strreportdroppedbad'] = '刪除報表作業失敗。'; - $lang['strconfdropreport'] = '您確定要刪除報表 "%s"?'; - $lang['strreportneedsname'] = '您需為您的報表命名。'; - $lang['strreportneedsdef'] = '您需給您的報表 SQL。'; - $lang['strreportcreated'] = '成功儲存報表。'; - $lang['strreportcreatedbad'] = '無法儲存報表。'; // Domains $lang['strdomain'] = '領域'; diff --git a/lang/chinese-utf8-zh_CN.php b/lang/chinese-utf8-zh_CN.php index e68fa9c2..d01cae4b 100644 --- a/lang/chinese-utf8-zh_CN.php +++ b/lang/chinese-utf8-zh_CN.php @@ -168,7 +168,6 @@ $lang['strnodata'] = '查无数据行。'; $lang['strnoobjects'] = '查无对象。'; $lang['strrownotunique'] = '该行无唯一约束。'; - $lang['strnoreportsdb'] = '你不能创建报告数据库。 请参阅INSTALL文件。'; $lang['strnouploads'] = '文件上传被禁止。'; $lang['strimporterror'] = '导入错误。'; $lang['strimporterror-fileformat'] = '导入错误: 自动识别文件类型失败。'; @@ -625,18 +624,6 @@ $lang['strspecifyschematodrop'] = '必须至少指定一个模式来删除'; // Reports - $lang['strreport'] = '报表'; - $lang['strreports'] = '报表'; - $lang['strshowallreports'] = '显示所有报表'; - $lang['strnoreports'] = '查无报表。'; - $lang['strcreatereport'] = '创建报表'; - $lang['strreportdropped'] = '报表已删除。'; - $lang['strreportdroppedbad'] = '报表删除失败。'; - $lang['strconfdropreport'] = '确定要删除报表"%s"吗？'; - $lang['strreportneedsname'] = '必须指定报表名称。'; - $lang['strreportneedsdef'] = '必须给报表指定SQL。'; - $lang['strreportcreated'] = '报表已保存。'; - $lang['strreportcreatedbad'] = '报表保存失败。'; // Domains $lang['strdomain'] = '域'; diff --git a/lang/chinese-utf8-zh_TW.php b/lang/chinese-utf8-zh_TW.php index 4f9f4e3b..5b0ff34f 100644 --- a/lang/chinese-utf8-zh_TW.php +++ b/lang/chinese-utf8-zh_TW.php @@ -168,7 +168,6 @@ $lang['strnodata'] = '找不到資料列。'; $lang['strnoobjects'] = '找不到物件。'; $lang['strrownotunique'] = '該資料列無唯一約束。'; - $lang['strnoreportsdb'] = '您尚未建立報表資料庫。請參閱指導 INSTALL 檔說明。'; $lang['strnouploads'] = '上傳檔案功能是已停用。'; $lang['strimporterror'] = '匯入錯誤。'; $lang['strimporterror-fileformat'] = '匯入錯誤: 自動識別檔案格式已失敗。'; @@ -621,18 +620,6 @@ $lang['strspecifyschematodrop'] = '您必須至少指定一個架構模式來刪除'; // Reports - $lang['strreport'] = '報表'; - $lang['strreports'] = '報表'; - $lang['strshowallreports'] = '顯示全部報表'; - $lang['strnoreports'] = '找不到任何報表。'; - $lang['strcreatereport'] = '建立報表'; - $lang['strreportdropped'] = '報表已移除。'; - $lang['strreportdroppedbad'] = '報表移除已失敗。'; - $lang['strconfdropreport'] = '您確定您要移除這個報表 "%s" 嗎?'; - $lang['strreportneedsname'] = '您必需為您的報表給一個名稱。'; - $lang['strreportneedsdef'] = '您必需為您的報表給 SQL。'; - $lang['strreportcreated'] = '報表已儲存。'; - $lang['strreportcreatedbad'] = '報表儲存已失敗。'; // Domains $lang['strdomain'] = '共同值域'; diff --git a/lang/czech.php b/lang/czech.php index 6e84d2ed..d97275a4 100644 --- a/lang/czech.php +++ b/lang/czech.php @@ -186,7 +186,6 @@ $lang['strnodata'] = 'Nenalezen žádný řádek.'; $lang['strnoobjects'] = 'Nenalezen žádný objekt.'; $lang['strrownotunique'] = 'Pro tento řádek neexistuje jedinečný identifikátor.'; - $lang['strnoreportsdb'] = 'Nemáte vytvořenou databázi výstupních sestav. Přečtěte si soubor INSTALL s instrukcemi.'; $lang['strnouploads'] = 'Je zakázané nahrávání souborů.'; $lang['strimporterror'] = 'Chyba při importu.'; $lang['strimporterror-fileformat'] = 'Chyba při importu: Nezdařilo se automaticky zjistit formát souboru.'; @@ -659,18 +658,6 @@ $lang['strspecifyschematodrop'] = 'Pokud chcete odstranit schémata, tak musíte nejméně jedno vybrat.'; // Reports - $lang['strreport'] = 'Výstupní sestava'; - $lang['strreports'] = 'Výstupní sestavy'; - $lang['strshowallreports'] = 'Zobrazit všechny výstupní sestavy'; - $lang['strnoreports'] = 'Nebyly nalezeny žádné výstupní sestava.'; - $lang['strcreatereport'] = 'Vytvořit výstupní sestavu'; - $lang['strreportdropped'] = 'Výstupní sestava byla odstraněna.'; - $lang['strreportdroppedbad'] = 'Nezdařilo se odstranit výstupní sestavu.'; - $lang['strconfdropreport'] = 'Opravdu chcete odstranit výstupní sestavu „%s“?'; - $lang['strreportneedsname'] = 'Musíte zadat název pro výstupní sestavu.'; - $lang['strreportneedsdef'] = 'Musíte zadat dotaz SQL pro výstupní sestavu.'; - $lang['strreportcreated'] = 'Výstupní sestava byla uložena.'; - $lang['strreportcreatedbad'] = 'Nezdařilo se uložit výstupní sestavu.'; // Domains $lang['strdomain'] = 'Doména'; diff --git a/lang/danish.php b/lang/danish.php index 7460151b..ace4f8d4 100644 --- a/lang/danish.php +++ b/lang/danish.php @@ -135,7 +135,6 @@ $lang['strnodata'] = 'Ingen rækker fundet.'; $lang['strnoobjects'] = 'Ingen objekter fundet.'; $lang['strrownotunique'] = 'Denne række har ingen unik nøgle.'; - $lang['strnoreportsdb'] = 'Du har ikke oprettet nogen rapportdatabase. For instruktioner læs filen INSTALL.'; // Tables $lang['strtable'] = 'Tabel'; @@ -495,20 +494,8 @@ $lang['strschemadroppedbad'] = 'Det lykkedes ikka at fjerne skema.'; // Reports - $lang['strreport'] = 'Rapport'; - $lang['strreports'] = 'Rapporter'; - $lang['strshowallreports'] = 'Vis alle rapporter'; $lang['strtopbar'] = '%s kører på %s:%s -- Du er logged ind som bruger "%s"'; $lang['strtimefmt'] = 'jS M, Y g:iA'; - $lang['strnoreports'] = 'Ingen rapporter fundet.'; - $lang['strcreatereport'] = 'Opret rapport'; - $lang['strreportdropped'] = 'Rapport fjernet.'; - $lang['strreportcreated'] = 'Rapport oprettet.'; - $lang['strreportneedsname'] = 'Rapport skal have et navn.'; - $lang['strreportcreatedbad'] = 'Det lykkedes ikke at oprette rapport.'; - $lang['strreportdroppedbad'] = 'Det lykkedes ikke at fjerne rapport.'; - $lang['strconfdropreport'] = 'Er du sikker på, at du vil fjerne rapporten "%s"?'; - $lang['strreportneedsdef'] = 'Du skal angive en SQL-forespørgsel.'; // Domains $lang['strdomain'] = 'Domæne'; diff --git a/lang/dutch.php b/lang/dutch.php index 4d844608..73d4fadc 100644 --- a/lang/dutch.php +++ b/lang/dutch.php @@ -401,18 +401,6 @@ $lang['strconfdropschema'] = 'Weet u zeker dat u het schema "%s" wilt verwijderen?'; $lang['strschemadropped'] = 'Schema verwijderd.'; $lang['strschemadroppedbad'] = 'Verwijdering van het schema mislukt.'; - $lang['strreport'] = 'Rapport'; - $lang['strreports'] = 'Rapporten'; - $lang['strshowallreports'] = 'Toon alle rapporten'; - $lang['strnoreports'] = 'Geen rapporten gevonden.'; - $lang['strcreatereport'] = 'Maak rapport aan'; - $lang['strreportdropped'] = 'Rapport verwijderd.'; - $lang['strreportdroppedbad'] = 'Verwijdering van rapport mislukt.'; - $lang['strconfdropreport'] = 'Weet u zeker dat u het rapport "%s" wilt verwijderen?'; - $lang['strreportneedsname'] = 'U dient een naam op te geven voor het rapport.'; - $lang['strreportneedsdef'] = 'U dient SQL op te geven voor het rapport.'; - $lang['strreportcreated'] = 'Rapport bewaard.'; - $lang['strreportcreatedbad'] = 'Bewaren van het rapport mislukt.'; $lang['strtopbar'] = '%s draaiend op %s:%s -- U bent ingelogd als gebruiker "%s"'; $lang['strtimefmt'] = 'jS M, Y g:iA'; $lang['strondelete'] = 'ON DELETE'; diff --git a/lang/english.php b/lang/english.php index 62f87371..671d6c71 100644 --- a/lang/english.php +++ b/lang/english.php @@ -186,7 +186,6 @@ $lang['strnodata'] = 'No rows found.'; $lang['strnoobjects'] = 'No objects found.'; $lang['strrownotunique'] = 'No unique identifier for this row.'; - $lang['strnoreportsdb'] = 'You have not created the reports database. Read the INSTALL file for directions.'; $lang['strnouploads'] = 'File uploads are disabled.'; $lang['strimporterror'] = 'Import error.'; $lang['strimporterror-fileformat'] = 'Import error: Failed to automatically determine the file format.'; @@ -661,18 +660,6 @@ $lang['strspecifyschematodrop'] = 'You must specify at least one schema to drop.'; // Reports - $lang['strreport'] = 'Report'; - $lang['strreports'] = 'Reports'; - $lang['strshowallreports'] = 'Show all reports'; - $lang['strnoreports'] = 'No reports found.'; - $lang['strcreatereport'] = 'Create report'; - $lang['strreportdropped'] = 'Report dropped.'; - $lang['strreportdroppedbad'] = 'Report drop failed.'; - $lang['strconfdropreport'] = 'Are you sure you want to drop the report "%s"?'; - $lang['strreportneedsname'] = 'You must give a name for your report.'; - $lang['strreportneedsdef'] = 'You must give SQL for your report.'; - $lang['strreportcreated'] = 'Report saved.'; - $lang['strreportcreatedbad'] = 'Failed to save report.'; // Domains $lang['strdomain'] = 'Domain'; diff --git a/lang/french.php b/lang/french.php index 43865e9f..8234d4e4 100644 --- a/lang/french.php +++ b/lang/french.php @@ -186,7 +186,6 @@ $lang['strnodata'] = 'Pas de résultats.'; $lang['strnoobjects'] = 'Aucun objet trouvé.'; $lang['strrownotunique'] = 'Pas d\'identifiant unique pour cette ligne.'; - $lang['strnoreportsdb'] = 'Vous n\'avez pas créé la base de données reports. Lisez le fichier INSTALL pour en savoir plus.'; $lang['strnouploads'] = 'Importation de fichiers désactivée.'; $lang['strimporterror'] = 'Erreur d\'importation.'; $lang['strimporterror-fileformat'] = 'Erreur d\'importation : échec lors de la détermination automatique du format de fichier.'; @@ -661,18 +660,6 @@ $lang['strspecifyschematodrop'] = 'Vous devez spécifier au moins un schéma à supprimer.'; // Reports - $lang['strreport'] = 'Rapport'; - $lang['strreports'] = 'Rapports'; - $lang['strshowallreports'] = 'Voir tous les rapports'; - $lang['strnoreports'] = 'Aucun rapport trouvé.'; - $lang['strcreatereport'] = 'Créer un rapport'; - $lang['strreportdropped'] = 'Rapport supprimé.'; - $lang['strreportdroppedbad'] = 'Échec lors de la suppression du rapport.'; - $lang['strconfdropreport'] = 'Êtes-vous sûr de vouloir supprimer le rapport « %s » ?'; - $lang['strreportneedsname'] = 'Vous devez indiquer un nom pour votre rapport.'; - $lang['strreportneedsdef'] = 'Vous devez fournir une requête SQL pour votre rapport.'; - $lang['strreportcreated'] = 'Rapport sauvegardé.'; - $lang['strreportcreatedbad'] = 'Échec lors de la sauvegarde du rapport.'; // Domains $lang['strdomain'] = 'Domaine'; diff --git a/lang/galician.php b/lang/galician.php index 750aa801..c3103cdd 100644 --- a/lang/galician.php +++ b/lang/galician.php @@ -197,7 +197,6 @@ $lang['strnodata'] = 'Non se atopou fila algunha.'; $lang['strnoobjects'] = 'Non se atopou obxecto algún.'; $lang['strrownotunique'] = 'Esta fila non ten ningún identificador único.'; - $lang['strnoreportsdb'] = 'Non creou a base de datos de informes. Lea o ficheiro »INSTALL» (en inglés) para máis información.'; $lang['strnouploads'] = 'A carga de ficheiros está desactivada.'; $lang['strimporterror'] = 'Produciuse un erro ao importar.'; $lang['strimporterror-fileformat'] = 'Produciuse un erro ao importar: non se puido determinar de maneira automática o formato do ficheiro.'; @@ -671,18 +670,6 @@ $lang['strspecifyschematodrop'] = 'Debe especificar polo menos un esquema a eliminar.'; // Reports - $lang['strreport'] = 'Informe'; - $lang['strreports'] = 'Informes'; - $lang['strshowallreports'] = 'Listar todos os informes'; - $lang['strnoreports'] = 'Non se atopou informe algún.'; - $lang['strcreatereport'] = 'Crear un informe'; - $lang['strreportdropped'] = 'Eliminouse o informe.'; - $lang['strreportdroppedbad'] = 'Non se conseguiu eliminar o informe.'; - $lang['strconfdropreport'] = 'Está seguro de que quere eliminar o informe «%s»?'; - $lang['strreportneedsname'] = 'Debe fornecer un nome para o informe.'; - $lang['strreportneedsdef'] = 'Debe fornecer un código SQL para o informe.'; - $lang['strreportcreated'] = 'Gardouse o informe.'; - $lang['strreportcreatedbad'] = 'Non se conseguiu gardar o informe.'; // Domains $lang['strdomain'] = 'Dominio'; diff --git a/lang/german.php b/lang/german.php index 6c98c894..aba15dd8 100644 --- a/lang/german.php +++ b/lang/german.php @@ -170,7 +170,6 @@ $lang['strnodata'] = 'Keine Datensätze gefunden.'; $lang['strnoobjects'] = 'Keine Objekte gefunden.'; $lang['strrownotunique'] = 'Dieser Datensatz hat keine eindeutige Spalte.'; - $lang['strnoreportsdb'] = 'Sie haben die Berichtsdatenbank nicht angelegt. In der Datei INSTALL finden Sie Anweisungen dafür.'; $lang['strnouploads'] = 'Das Hochladen von Dateien ist ausgeschaltet.'; $lang['strimporterror'] = 'Importfehler.'; $lang['strimporterror-fileformat'] = 'Importfehler: Dateiformat konnte nicht automatisch bestimmt werden.'; @@ -625,18 +624,6 @@ $lang['strspecifyschematodrop'] = 'Sie müssen mindestens ein Schema angeben, das gelöscht werden soll.'; // Reports - $lang['strreport'] = 'Bericht'; - $lang['strreports'] = 'Berichte'; - $lang['strshowallreports'] = 'Alle Berichte anzeigen'; - $lang['strnoreports'] = 'Keine Berichte gefunden.'; - $lang['strcreatereport'] = 'Bericht erstellen.'; - $lang['strreportdropped'] = 'Bericht gelöscht.'; - $lang['strreportdroppedbad'] = 'Löschen des Berichtes fehlgeschlagen.'; - $lang['strconfdropreport'] = 'Sind Sie sicher, dass Sie den Bericht "%s" löschen wollen?'; - $lang['strreportneedsname'] = 'Sie müssen für den Bericht einen Namen angeben.'; - $lang['strreportneedsdef'] = 'Sie müssen eine SQL-Abfrage für den Bericht eingeben.'; - $lang['strreportcreated'] = 'Bericht gespeichert.'; - $lang['strreportcreatedbad'] = 'Speichern des Berichtes fehlgeschlagen.'; // Domains $lang['strdomain'] = 'Domäne'; diff --git a/lang/greek.php b/lang/greek.php index 49e32a88..8793bda5 100644 --- a/lang/greek.php +++ b/lang/greek.php @@ -154,7 +154,6 @@ $lang['strnodata'] = 'Δε βρέθηκαν γραμμές.'; $lang['strnoobjects'] = 'Δε βρέθηκαν αντικείμενα.'; $lang['strrownotunique'] = 'Δε βρέθηκε μοναδικό κλειδί στη γραμμή.'; - $lang['strnoreportsdb'] = 'Η βάση αναφορών δεν έχει δημιουργηθεί. Διαβάστε το αρχείο INSTALL για οδηγίες.'; $lang['strnouploads'] = 'Η αποστολή αρχείων είναι απενεργοποιημένη.'; $lang['strimporterror'] = 'Σφάλμα κατά την εισαγωγή.'; $lang['strimporterror-fileformat'] = 'Σφάλμα κατά την εισαγωγή: απέτυχε η αυτόματη αναγνώριση του τύπου του αρχείου.'; @@ -576,18 +575,6 @@ $lang['strsearchpath'] = 'Πορεία αναζήτησης σχήματος'; // Reports - $lang['strreport'] = 'Αναφορά'; - $lang['strreports'] = 'Αναφορές'; - $lang['strshowallreports'] = 'Εμφάνιση όλων των αναφορών'; - $lang['strnoreports'] = 'Δε βρέθηκαν αναφορές.'; - $lang['strcreatereport'] = 'Δημιουργία αναφοράς'; - $lang['strreportdropped'] = 'Η αναφορά διαγράφηκε.'; - $lang['strreportdroppedbad'] = 'Η διαγραφή της αναφοράς απέτυχε.'; - $lang['strconfdropreport'] = 'Να διαγραφεί η αναφορά "%s"?'; - $lang['strreportneedsname'] = 'Πρέπει να δώσετε όνομα στην αναφορά.'; - $lang['strreportneedsdef'] = 'Πρέπει να δώσετε SQL για την αναφορά.'; - $lang['strreportcreated'] = 'Η αναφορά αποθηκεύτηκε.'; - $lang['strreportcreatedbad'] = 'Η αποθήκευση της αναφοράς απέτυχε.'; // Domains $lang['strdomain'] = 'Τομέας'; diff --git a/lang/hebrew.php b/lang/hebrew.php index bd68b067..2dbfc7b6 100644 --- a/lang/hebrew.php +++ b/lang/hebrew.php @@ -137,7 +137,6 @@ $lang['strnodata'] = 'לא נמצאו שורות.'; $lang['strnoobjects'] = 'לא נמצאו נתונים.'; $lang['strrownotunique'] = 'No unique identifier for this row.'; - $lang['strnoreportsdb'] = 'לא יצרתה בסיס נתונים בישביל הדוחות. אנא קרא את קובץ ה INSTALL בישביל הדרכה.'; $lang['strnouploads'] = 'העלאת קבצים בוטלה.'; $lang['strimporterror'] = 'שגיאת יבוא.'; $lang['strimporterrorline'] = 'שגיאת יבוא בשורה: %s.'; @@ -496,18 +495,6 @@ $lang['strsearchpath'] = 'חיפוש מיקום התרשים.'; // Reports - $lang['strreport'] = 'דוח'; - $lang['strreports'] = 'דוחות'; - $lang['strshowallreports'] = 'הראה את כל הדוחות'; - $lang['strnoreports'] = 'לא נמצאו דוחות.'; - $lang['strcreatereport'] = 'צור דוח'; - $lang['strreportdropped'] = 'דוח נמחק.'; - $lang['strreportdroppedbad'] = 'מחיקת דוח נכשלה'; - $lang['strconfdropreport'] = 'האם אתה בטוח שברצונך למחוק את הדוח "%s"l?'; - $lang['strreportneedsname'] = 'אתה חייב לציין שם לדוח.'; - $lang['strreportneedsdef'] = 'אתה חייב לתת SQL לדוח.'; - $lang['strreportcreated'] = 'דוח נשמר.'; - $lang['strreportcreatedbad'] = 'שמירת דוח נכשלה.'; // Domains $lang['strdomain'] = 'תחום'; diff --git a/lang/hungarian.php b/lang/hungarian.php index 19140d74..a6d5284a 100644 --- a/lang/hungarian.php +++ b/lang/hungarian.php @@ -186,7 +186,6 @@ $lang['strnodata'] = 'Nincsenek sorok.'; $lang['strnoobjects'] = 'Nincsenek objektumok.'; $lang['strrownotunique'] = 'Nincs egyedi azonosító ehhez a sorhoz.'; - $lang['strnoreportsdb'] = 'Ön még nem teremtette meg a jelentések adatbázisát. Olvassa el az INSTALL fájlt további útmutatásért!'; $lang['strnouploads'] = 'Fájl feltöltése letiltva.'; $lang['strimporterror'] = 'Behozatali hiba.'; $lang['strimporterror-fileformat'] = 'Behozatali hiba: nem sikerült automatikusan megállapítani a fájl formátumát.'; @@ -659,18 +658,6 @@ $lang['strspecifyschematodrop'] = 'Meg kell adni a törlendő sémát'; // Reports - $lang['strreport'] = 'Jelentés'; - $lang['strreports'] = 'Jelentések'; - $lang['strshowallreports'] = 'Minden jelentést megjelenít'; - $lang['strnoreports'] = 'Nincsenek jelentések.'; - $lang['strcreatereport'] = 'Jelentést teremt'; - $lang['strreportdropped'] = 'A jelentés törölve.'; - $lang['strreportdroppedbad'] = 'Nem sikerült törölni a jelentést.'; - $lang['strconfdropreport'] = 'Biztosan törölni kívánja „%s” jelentést?'; - $lang['strreportneedsname'] = 'Meg kell adni a jelentésnevet.'; - $lang['strreportneedsdef'] = 'SQL kifejezést kell hozzáadni a jelentéshez.'; - $lang['strreportcreated'] = 'A jelentés megteremtve.'; - $lang['strreportcreatedbad'] = 'Nem sikerült megteremteni a jelentést.'; // Domains $lang['strdomain'] = 'Tartomány'; diff --git a/lang/italian.php b/lang/italian.php index 217151d6..37919894 100644 --- a/lang/italian.php +++ b/lang/italian.php @@ -159,7 +159,6 @@ $lang['strnodata'] = 'Nessuna riga trovata.'; $lang['strnoobjects'] = 'Nessun oggetto trovato.'; $lang['strrownotunique'] = 'Nessun identificatore univoco per questa riga.'; - $lang['strnoreportsdb'] = 'Non è stato creato il database dei report. Leggere il file INSTALL per istruzioni.'; $lang['strnouploads'] = 'L\'upload dei file è disabilitato.'; $lang['strimporterror'] = 'Errore durante l\'import.'; $lang['strimporterror-fileformat'] = 'Errore durante l\'import: determinazione automatica del formato del file fallita.'; @@ -567,18 +566,6 @@ $lang['strsearchpath'] = 'Ordine di ricerca dello schema'; // Reports - Rapporti - $lang['strreport'] = 'Rapporto'; - $lang['strreports'] = 'Rapporti'; - $lang['strshowallreports'] = 'Mostra tutti i rapporti'; - $lang['strnoreports'] = 'Nessun rapporto trovato.'; - $lang['strcreatereport'] = 'Crea rapporto'; - $lang['strreportdropped'] = 'Rapporto eliminato.'; - $lang['strreportdroppedbad'] = 'Eliminazione del rapporto fallita.'; - $lang['strconfdropreport'] = 'Eliminare il rapporto "%s"?'; - $lang['strreportneedsname'] = 'È necessario specificare un nome per il rapporto.'; - $lang['strreportneedsdef'] = 'È necessario inserire il codice SQL per il rapporto.'; - $lang['strreportcreated'] = 'Rapporto salvato'; - $lang['strreportcreatedbad'] = 'Salvataggio del rapporto fallito.'; // Domains - Domini $lang['strdomain'] = 'Dominio'; diff --git a/lang/japanese.php b/lang/japanese.php index 9c4ab55e..ac51a558 100644 --- a/lang/japanese.php +++ b/lang/japanese.php @@ -168,7 +168,6 @@ $lang['strclustered'] = 'Clustered?'; $lang['strnodata'] = 'レコードが見つかりません。'; $lang['strnoobjects'] = 'オブジェクトが見つかりません。'; $lang['strrownotunique'] = 'このレコードには一意識別子がありません。'; - $lang['strnoreportsdb'] = 'レポートデータベースが作成されていません。ディレクトリにある INSTALL ファイルを読んでください。'; $lang['strnouploads'] = 'ファイルアップロードが無効です。'; $lang['strimporterror'] = 'インポートエラー'; $lang['strimporterror-fileformat'] = 'インポートエラー: ファイル形式を自動的に確定できません。.'; @@ -626,18 +625,6 @@ $lang['strenumvalues'] = 'Enum Values'; $lang['strspecifyschematodrop'] = 'スキーマを破棄するには少なくとも 1 つ指定しなければなりません'; // Reports - $lang['strreport'] = 'レポート'; - $lang['strreports'] = 'レポート'; - $lang['strshowallreports'] = 'すべてのレポートを表示する'; - $lang['strnoreports'] = 'レポートが見つかりません。'; - $lang['strcreatereport'] = 'レポートを作成する'; - $lang['strreportdropped'] = 'レポートを破棄しました。'; - $lang['strreportdroppedbad'] = 'レポートの破棄に失敗しました。'; - $lang['strconfdropreport'] = '本当にレポート「%s」を破棄しますか?'; - $lang['strreportneedsname'] = 'レポート名を指定する必要があります。'; - $lang['strreportneedsdef'] = 'レポート用のSQLを指定する必要があります。'; - $lang['strreportcreated'] = 'レポートの保存をしました。'; - $lang['strreportcreatedbad'] = 'レポートの保存に失敗しました。'; // Domains $lang['strdomain'] = 'ドメイン'; diff --git a/lang/lithuanian.php b/lang/lithuanian.php index f3c5504f..19c83b63 100644 --- a/lang/lithuanian.php +++ b/lang/lithuanian.php @@ -186,7 +186,6 @@ $lang['strctype'] = 'Character Type';//Simbolių(ženklų) tipas $lang['strnodata'] = 'Įrašų nerasta.'; $lang['strnoobjects'] = 'Objektų nerasta.'; $lang['strrownotunique'] = 'Šiame įraše nėra unikalaus identifikatoriaus.'; - $lang['strnoreportsdb'] = 'Jūs nesate sukūrę ataskaitų duomenų bazės. Instrukcijas skaitykite INSTALL faile.'; $lang['strnouploads'] = 'Failų išsiuntimai - negalimi.'; $lang['strimporterror'] = 'Importavimo klaida.'; $lang['strimporterror-fileformat'] = 'Importavimo klaida: Nepavyko automatiškai nustatyti failo formato.'; @@ -660,18 +659,6 @@ $lang['strenum'] = 'Enum'; $lang['strspecifyschematodrop'] = 'Turite nurodyti bent vieną schemą, kurią norite pašalinti.'; // Reports - $lang['strreport'] = 'Ataskaita'; - $lang['strreports'] = 'Ataskaitos'; - $lang['strshowallreports'] = 'Rodyti visas ataskaitas'; - $lang['strnoreports'] = 'Ataskaitų nerasta.'; - $lang['strcreatereport'] = 'Kurti ataskaitą'; - $lang['strreportdropped'] = 'Ataskaita pašalinta.'; - $lang['strreportdroppedbad'] = 'Nepavyko pašalinti ataskaitos.'; - $lang['strconfdropreport'] = 'Ar tikrai norite šalinti ataskaitą "%s"?'; - $lang['strreportneedsname'] = 'Turite suteikti ataskaitai pavadinimą.'; - $lang['strreportneedsdef'] = 'Turite pateikti ataskaitos SQL apibrėžtį.'; - $lang['strreportcreated'] = 'Ataskaita įrašyta.'; - $lang['strreportcreatedbad'] = 'Nepavyko įrašyti ataskaitos.'; // Domains $lang['strdomain'] = 'Domenas'; diff --git a/lang/mongol.php b/lang/mongol.php index 13bbdd24..12e8b1eb 100644 --- a/lang/mongol.php +++ b/lang/mongol.php @@ -451,18 +451,6 @@ $lang['strschemadroppedbad'] = 'ѕЮЩодЯжХЮЩХ гШХЭй авХвзСЮЯ.'; // Reports - $lang['strreport'] = 'ядоХд'; - $lang['strreports'] = 'ядоХдй'; - $lang['strshowallreports'] = '№ЯЫСкСди згХ ЯдоХдй'; - $lang['strnoreports'] = 'ядоХдЯз ЮХд.'; - $lang['strcreatereport'] = 'ѓЯкФСди ЯдоХд'; - $lang['strreportdropped'] = 'ядоХд еЮЩодЯжХЮ.'; - $lang['strreportdroppedbad'] = 'ѕЮЩодЯжХЮЩХ ЯдоХдС авХвзСЮЯ.'; - $lang['strconfdropreport'] = 'їй езХвХЮй, одЯ ШЯдЩдХ еЮЩодЯжЩди ЯдоХд "%s"?'; - $lang['strreportneedsname'] = 'їСЭ ЮХЯТШЯФЩЭЯ еЫСкСди ЩЭб ЯдоХдС.'; - $lang['strreportneedsdef'] = 'їСЭ ЮХЯТШЯФЩЭЯ еЫСкСди SQL-кСавЯг ФЬб їСлХЧЯ ЯдоХдС.'; - $lang['strreportcreated'] = 'ядоХд гЯШвСЮХЮ.'; - $lang['strreportcreatedbad'] = 'ѓЯШвСЮХЮЩХ ЯдоХдС авХвзСЮЯ.'; // Domains $lang['strdomain'] = 'фЯЭХЮ'; diff --git a/lang/polish.php b/lang/polish.php index 51e942fa..b03cb3b2 100644 --- a/lang/polish.php +++ b/lang/polish.php @@ -159,7 +159,6 @@ $lang['strnodata'] = 'Nie znaleziono danych.'; $lang['strnoobjects'] = 'Nie znaleziono obiektów.'; $lang['strrownotunique'] = 'Brak unikatowego identyfikatora dla tego wiersza.'; - $lang['strnoreportsdb'] = 'Nie utworzyłeś bazy raportów. Instrukcję znajdziesz w pliku INSTALL.'; $lang['strnouploads'] = 'Ładowanie plików wyłączone.'; $lang['strimporterror'] = 'Błąd importu.'; $lang['strimporterror-fileformat'] = 'Błąd importu: Nie można automatycznie określić formatu pliku.'; @@ -575,18 +574,6 @@ $lang['strsearchpath'] = 'Ścieżka wyszukiwania schematu'; // Reports - $lang['strreport'] = 'Raport'; - $lang['strreports'] = 'Raporty'; - $lang['strshowallreports'] = 'Pokaż wszystkie raporty'; - $lang['strnoreports'] = 'Nie znaleziono raportów.'; - $lang['strcreatereport'] = 'Utwórz raport'; - $lang['strreportdropped'] = 'Raport został usunięty.'; - $lang['strreportdroppedbad'] = 'Próba usunięcia raportu się nie powiodła.'; - $lang['strconfdropreport'] = 'Czy na pewno chcesz usunąć raport "%s"?'; - $lang['strreportneedsname'] = 'Musisz nazwać raport.'; - $lang['strreportneedsdef'] = 'Musisz podać zapytanie SQL definiujące raport.'; - $lang['strreportcreated'] = 'Raport został utworzony.'; - $lang['strreportcreatedbad'] = 'Próba utworzenia raportu się nie powiodła.'; // Domeny $lang['strdomain'] = 'Domena'; diff --git a/lang/portuguese-br.php b/lang/portuguese-br.php index 5f8e77cc..1aafec60 100644 --- a/lang/portuguese-br.php +++ b/lang/portuguese-br.php @@ -185,7 +185,6 @@ $lang['strnodata'] = 'Nenhuma linha encontrada.'; $lang['strnoobjects'] = 'Nenhum objeto encontrado.'; $lang['strrownotunique'] = 'Nenhum identificador único para esta linha.'; - $lang['strnoreportsdb'] = 'Você não criou a base de dados para relatórios. Leia o arquivo INSTALL para resolução.'; $lang['strnouploads'] = 'O upload de arquivos está desabilitado.'; $lang['strimporterror'] = 'Erro de importação.'; $lang['strimporterror-fileformat'] = 'Erro de importação: Falhou ao determinar automáticamente o formato do arquivo.'; @@ -660,18 +659,6 @@ $lang['strspecifyschematodrop'] = 'Você deve informar ao menos um esquema para deletar.'; // Reports - $lang['strreport'] = 'Relatório'; - $lang['strreports'] = 'Relatórios'; - $lang['strshowallreports'] = 'Exibir todos os relatórios'; - $lang['strnoreports'] = 'Nenhum relatório encontrado.'; - $lang['strcreatereport'] = 'Criar relatório'; - $lang['strreportdropped'] = 'Relatório deletado.'; - $lang['strreportdroppedbad'] = 'Falha ao deletar o relatório.'; - $lang['strconfdropreport'] = 'Você têm certeza que deseja deletar o relatório "%s"?'; - $lang['strreportneedsname'] = 'Você deve informar um nome para o seu relatório.'; - $lang['strreportneedsdef'] = 'Você deve informar o SQL para o seu relatório.'; - $lang['strreportcreated'] = 'Relatório salvo.'; - $lang['strreportcreatedbad'] = 'Falha ao salvar o relatório.'; // Domains $lang['strdomain'] = 'Domínio'; diff --git a/lang/portuguese-pt.php b/lang/portuguese-pt.php index e4006ccb..18079f5e 100644 --- a/lang/portuguese-pt.php +++ b/lang/portuguese-pt.php @@ -406,18 +406,6 @@ $lang['strschemadropped'] = 'Esquema eliminado.'; $lang['strschemadroppedbad'] = 'Falha ao eliminar o esquema.'; // Reports -$lang['strreport'] = 'Relatório'; -$lang['strreports'] = 'Relatórios'; -$lang['strshowallreports'] = 'Exibir todos os relatórios'; -$lang['strnoreports'] = 'Relatório não encontrado.'; -$lang['strcreatereport'] = 'Criar relatório'; -$lang['strreportdropped'] = 'Relatório eliminado.'; -$lang['strreportdroppedbad'] = 'Falha ao eliminar o relatório.'; -$lang['strconfdropreport'] = 'Tem certeza que quer eliminar o relatório "%s"?'; -$lang['strreportneedsname'] = 'Dê um nome ao seu relatório.'; -$lang['strreportneedsdef'] = 'Adicione a instrução SQL ao seu relatório.'; -$lang['strreportcreated'] = 'Relatório salvo.'; -$lang['strreportcreatedbad'] = 'Falha ao salvar o relatório.'; // Miscellaneous $lang['strtopbar'] = '%s a correr em %s:%s -- Você está ligado como "%s"'; @@ -461,7 +449,6 @@ $lang['strphpversionnotsupported'] = 'Versão do PHP não é suportada. Por favo $lang['strpostgresqlversionnotsupported'] = 'Versão do PostgreSQL não é suportada. Por favor actualize para a versão %s ou superior.'; $lang['strnoobjects'] = 'Não foram escontrados objectos.'; $lang['strrownotunique'] = 'Não existe identificador único para esta linha.'; -$lang['strnoreportsdb'] = 'Não criou uma base de dados de relatório. Leia o ficheiro INSTALL para mais informações.'; $lang['strnouploads'] = 'Upload de ficheiros indisponível.'; $lang['strimporterror'] = 'Erro na importação.'; $lang['strimporterrorline'] = 'Erro ao importar na linha %s.'; diff --git a/lang/romanian.php b/lang/romanian.php index 8248f6c8..67e875f3 100644 --- a/lang/romanian.php +++ b/lang/romanian.php @@ -156,7 +156,6 @@ $lang['strnodata'] = 'Nici un rând găsit.'; $lang['strnoobjects'] = 'Nici un obiect găsit.'; $lang['strrownotunique'] = 'Nici un identificator unic pentru acest rând.'; - $lang['strnoreportsdb'] = 'Nu aţi creat baza de date pentru rapoarte. Citiţi fişierul INSTALL pentru instrucţiuni.'; $lang['strnouploads'] = 'Încărcarea de fişiere este dezactivată.'; $lang['strimporterror'] = 'Eroare la importare.'; $lang['strimporterror-fileformat'] = 'Eroare la importare: Imposibil de determinat în mod automat formatul fişierului.'; @@ -582,18 +581,6 @@ $lang['strsearchpath'] = 'Cale de căutare pentru schemă'; // Reports - $lang['strreport'] = 'Raport'; - $lang['strreports'] = 'Rapoarte'; - $lang['strshowallreports'] = 'Afişare toate rapoartele'; - $lang['strnoreports'] = 'Nici un raport găsit.'; - $lang['strcreatereport'] = 'Creare raport'; - $lang['strreportdropped'] = 'Report dropped.'; - $lang['strreportdroppedbad'] = 'Ştergere raport eşuată.'; - $lang['strconfdropreport'] = 'Sigur ştergeţi raportul "%s"?'; - $lang['strreportneedsname'] = 'Specificaţi un nume pentru raport.'; - $lang['strreportneedsdef'] = 'Specificaţi o instrucţiune SQL pentru raport.'; - $lang['strreportcreated'] = 'Raport salvat.'; - $lang['strreportcreatedbad'] = 'Salvare raport eşuată.'; // Domains $lang['strdomain'] = 'Domeniu'; diff --git a/lang/russian-utf8.php b/lang/russian-utf8.php index ee6af314..11a2a407 100644 --- a/lang/russian-utf8.php +++ b/lang/russian-utf8.php @@ -186,7 +186,6 @@ $lang['strnodata'] = 'Данных не найдено.'; $lang['strnoobjects'] = 'Объектов не найдено.'; $lang['strrownotunique'] = 'Нет уникального идентификатора для этой записи.'; - $lang['strnoreportsdb'] = 'Вы не создали базу данных отчетов. Читайте разъяснения в файле INSTALL.'; $lang['strnouploads'] = 'Загрузка файла невозможна.'; $lang['strimporterror'] = 'Ошибка импорта.'; $lang['strimporterror-fileformat'] = 'Ошибка импорта: Невозможно автоматически определить формат файла.'; @@ -656,18 +655,6 @@ $lang['strspecifyschematodrop'] = 'Вам необходимо указать как минимум одну схему для удаления.'; // Reports - $lang['strreport'] = 'Отчет'; - $lang['strreports'] = 'Отчеты'; - $lang['strshowallreports'] = 'Показать все отчеты'; - $lang['strnoreports'] = 'Отчетов нет.'; - $lang['strcreatereport'] = 'Создать отчет'; - $lang['strreportdropped'] = 'Отчет уничтожен.'; - $lang['strreportdroppedbad'] = 'Уничтожение отчета прервано.'; - $lang['strconfdropreport'] = 'Вы уверены, что хотите уничтожить отчет "%s"?'; - $lang['strreportneedsname'] = 'Вам необходимо указать имя отчета.'; - $lang['strreportneedsdef'] = 'Вам необходимо указать SQL-запрос для Вашего отчета.'; - $lang['strreportcreated'] = 'Отчет сохранен.'; - $lang['strreportcreatedbad'] = 'Сохранение отчета прервано.'; // Domains $lang['strdomain'] = 'Домен'; diff --git a/lang/russian.php b/lang/russian.php index c1e5f58d..d1c86bbd 100644 --- a/lang/russian.php +++ b/lang/russian.php @@ -134,7 +134,6 @@ $lang['strnodata'] = 'Данных не найдено.'; $lang['strnoobjects'] = 'Объектов не найдено.'; $lang['strrownotunique'] = 'Нет уникального идентификатора для этой записи.'; - $lang['strnoreportsdb'] = 'Вы не создали базу данных отчетов. Читайте разъяснения в файле INSTALL.'; $lang['strnouploads'] = 'Загрузка файла невозможна.'; $lang['strimporterror'] = 'Ошибка импорта.'; $lang['strimporterrorline'] = 'Ошибка канала при импорте %s.'; @@ -484,18 +483,6 @@ $lang['strschemaalteredbad'] = 'Обновление схемы прервано.'; // Reports - $lang['strreport'] = 'Отчет'; - $lang['strreports'] = 'Отчеты'; - $lang['strshowallreports'] = 'Показать все отчеты'; - $lang['strnoreports'] = 'Отчетов нет.'; - $lang['strcreatereport'] = 'Создать отчет'; - $lang['strreportdropped'] = 'Отчет уничтожен.'; - $lang['strreportdroppedbad'] = 'Уничтожение отчета прервано.'; - $lang['strconfdropreport'] = 'Вы уверены, что хотите уничтожить отчет "%s"?'; - $lang['strreportneedsname'] = 'Вам необходимо указать имя отчета.'; - $lang['strreportneedsdef'] = 'Вам необходимо указать SQL-запрос для Вашего отчета.'; - $lang['strreportcreated'] = 'Отчет сохранен.'; - $lang['strreportcreatedbad'] = 'Сохранение отчета прервано.'; // Domains $lang['strdomain'] = 'Домен'; diff --git a/lang/slovak.php b/lang/slovak.php index 77b39dfe..ef7756e1 100644 --- a/lang/slovak.php +++ b/lang/slovak.php @@ -147,7 +147,6 @@ $lang['strexecute'] = 'Execute'; $lang['strnodata'] = 'Nenájdené žiadne záznamy.'; $lang['strnoobjects'] = 'Nenájdené žiadne objekty.'; $lang['strrownotunique'] = 'Žiadny unikátny identifikárot pre tento riadok.'; - $lang['strnoreportsdb'] = 'Nebola vytvorené report databáza. Prečítaj si INSTALL súbor s pokynmi.'; $lang['strnouploads'] = 'Upload súborov je vypnutý.'; $lang['strimporterror'] = 'Chyba Import-u.'; $lang['strimporterror-fileformat'] = 'Chyba importu: Automatické určenie formátu súboru zlyhalo.'; @@ -522,18 +521,6 @@ $lang['strcluster'] = 'Cluster'; $lang['strsearchpath'] = 'Cesta k nájdeniu Schémy'; // Reports - $lang['strreport'] = 'Report'; - $lang['strreports'] = 'Reporty'; - $lang['strshowallreports'] = 'Zobraziť Všetky Reporty'; - $lang['strnoreports'] = 'Nenájdené žiadne reporty.'; - $lang['strcreatereport'] = 'Vytvoriť Report'; - $lang['strreportdropped'] = 'Report zmazaný.'; - $lang['strreportdroppedbad'] = 'Report nebol zmazaný.'; - $lang['strconfdropreport'] = 'Naozaj chceš zmazať report "%s"?'; - $lang['strreportneedsname'] = 'Musíš zadať názov pre tvoj report.'; - $lang['strreportneedsdef'] = 'Musíš zadať SQL dotaz pre tvoj report.'; - $lang['strreportcreated'] = 'Report uložený.'; - $lang['strreportcreatedbad'] = 'Report nebol uložený.'; //Domains $lang['strdomain'] = 'Doména'; diff --git a/lang/spanish.php b/lang/spanish.php index b3bb31e8..c1d20918 100644 --- a/lang/spanish.php +++ b/lang/spanish.php @@ -186,7 +186,6 @@ $lang['strnodata'] = 'No se encontraron filas.'; $lang['strnoobjects'] = 'No se encontraron objetos.'; $lang['strrownotunique'] = 'No existe un identificador único para este registro.'; - $lang['strnoreportsdb'] = 'Aún no se ha creado la base de datos para los reportes. Lea las instrucciones del archivo INSTALL.'; $lang['strnouploads'] = 'Está deshabilitada la subida de archivos.'; $lang['strimporterror'] = 'Error de importación.'; $lang['strimporterror-fileformat'] = 'Error de importacion de datos: Falló al intentar determinar el formato del archivo.'; @@ -660,18 +659,6 @@ $lang['strspecifyschematodrop'] = 'Debe especificar al menos un esquemaa eliminar.'; // Reports - $lang['strreport'] = 'Reporte'; - $lang['strreports'] = 'Reportes'; - $lang['strshowallreports'] = 'Mostrar todos los reportes'; - $lang['strnoreports'] = 'No se encontró el reporte.'; - $lang['strcreatereport'] = 'Crear Reporte'; - $lang['strreportdropped'] = 'Reporte eliminado.'; - $lang['strreportdroppedbad'] = 'Falló al eliminar el Reporte.'; - $lang['strconfdropreport'] = '¿Estás seguro que quiere eliminar el reporte "%s"?'; - $lang['strreportneedsname'] = 'Debe especificar un nombre para el reporte.'; - $lang['strreportneedsdef'] = 'Debe especificar un SQL para el reporte.'; - $lang['strreportcreated'] = 'Reporte guardado.'; - $lang['strreportcreatedbad'] = 'Falló al guardar el reporte.'; //Domains $lang['strdomain'] = 'Dominio'; diff --git a/lang/swedish.php b/lang/swedish.php index 8c67d6b9..8a0a570f 100644 --- a/lang/swedish.php +++ b/lang/swedish.php @@ -128,7 +128,6 @@ $lang['strnodata'] = 'Hittade inga rader.'; $lang['strnoobjects'] = 'Hittade inga objekt.'; $lang['strrownotunique'] = 'Ingen unik nyckel för denna rad.'; - $lang['strnoreportsdb'] = 'Du har inte skapat någon rapportdatabas. Läs filen INSTALL för instruktioner.'; // Tables $lang['strtable'] = 'Tabell'; @@ -461,20 +460,8 @@ $lang['strschemadroppedbad'] = 'Misslyckades att radera schema.'; // Reports - $lang['strreport'] = 'Rapport'; - $lang['strreports'] = 'Rapporter'; - $lang['strshowallreports'] = 'Visa alla rapporter'; $lang['strtopbar'] = '%s körs på %s:%s -- Du är inloggad som användare "%s"'; $lang['strtimefmt'] = 'jS M, Y g:iA'; - $lang['strnoreports'] = 'Hittade inga rapporter.'; - $lang['strcreatereport'] = 'Skapa rapport'; - $lang['strreportdropped'] = 'Rapport skapad.'; - $lang['strreportcreated'] = 'Rapport sparad.'; - $lang['strreportneedsname'] = 'Du måste namnge din rapport.'; - $lang['strreportcreatedbad'] = 'Misslyckades att spara rapport.'; - $lang['strreportdroppedbad'] = 'Misslyckades att skapa rapport.'; - $lang['strconfdropreport'] = 'Är du säker på att du vill radera rapporten "%s"?'; - $lang['strreportneedsdef'] = 'Du måste ange din SQL-fråga.'; // Domains $lang['strdomain'] = 'Domän'; diff --git a/lang/turkish.php b/lang/turkish.php index 6eae9e93..4542de07 100644 --- a/lang/turkish.php +++ b/lang/turkish.php @@ -149,7 +149,6 @@ $lang['strexecute'] = 'Execute'; $lang['strnodata'] = 'Satır bulunamadı.'; $lang['strnoobjects'] = 'Hiçbir nesne bulunamadı..'; $lang['strrownotunique'] = 'Bu satır için hiçbir tekil belirtici bulunamadı.'; - $lang['strnoreportsdb'] = 'reports veritabanı yaratışmamış. Yönergeler için lütfen INSTALL dosyasını okuyunuz.'; $lang['strnouploads'] = 'Dosya yükleme özelliği etkin değil.'; $lang['strimporterror'] = 'Import hatası.'; $lang['strimporterror-fileformat'] = 'Import hatası: Dosya tipi otomatik olarak belirlenemedi.'; @@ -524,18 +523,6 @@ $lang['strcannotdumponwindows'] = 'Dumping of complex table and schema names o $lang['strsearchpath'] = 'Şema arama yolu'; // Reports - $lang['strreport'] = 'Rapor'; - $lang['strreports'] = 'Raporlar'; - $lang['strshowallreports'] = 'Tüm raporları göster'; - $lang['strnoreports'] = 'Hiçbir rapor bulunamadı'; - $lang['strcreatereport'] = 'Rapor yaratıldı.'; - $lang['strreportdropped'] = 'Rapor silindi'; - $lang['strreportdroppedbad'] = 'Rapor silme işi başarısız oldu.'; - $lang['strconfdropreport'] = '"%s" raporunu silmek istediğinize emin misiniz?'; - $lang['strreportneedsname'] = 'Raporunuza bir ad vermelisiniz.'; - $lang['strreportneedsdef'] = 'Raporunuz için SQL sorguları yazmalısınız.'; - $lang['strreportcreated'] = 'Rapor kaydedildi.'; - $lang['strreportcreatedbad'] = 'Rapor kaydetme başarısız oldu.'; $lang['strdomain'] = 'Domain'; $lang['strdomains'] = 'Domainler'; $lang['strshowalldomains'] = 'Tüm domainleri göster.'; diff --git a/lang/ukrainian.php b/lang/ukrainian.php index 38d8295e..b929fd50 100644 --- a/lang/ukrainian.php +++ b/lang/ukrainian.php @@ -132,7 +132,6 @@ $lang['strnodata'] = 'Даних не виявлено.'; $lang['strnoobjects'] = 'Об"╓кт╕в не виявлено.'; $lang['strrownotunique'] = 'Нема╓ ун╕кального ╕дентиф╕катора для цього запису.'; - $lang['strnoreportsdb'] = 'Ви не створили базу даних зв╕т╕в. Читайте пояснення в файл╕ INSTALL.'; $lang['strnouploads'] = 'Завантаження файла неможливе.'; $lang['strimporterror'] = 'Помилка при ╕мпортуванн╕.'; $lang['strimporterrorline'] = 'Помилка каналу при ╕мпортов╕ %s.'; @@ -482,18 +481,6 @@ $lang['strschemaalteredbad'] = 'Оновлення схеми перервано.'; // Reports - $lang['strreport'] = 'Зв╕т'; - $lang['strreports'] = 'Зв╕ти'; - $lang['strshowallreports'] = 'Показати вс╕ зв╕ти'; - $lang['strnoreports'] = 'Зв╕т╕в нема╓.'; - $lang['strcreatereport'] = 'Створити зв╕т'; - $lang['strreportdropped'] = 'Зв╕т видалено.'; - $lang['strreportdroppedbad'] = 'Видалення зв╕та перервано.'; - $lang['strconfdropreport'] = 'Ви впевнен╕, що бажа╓тее видалити зв╕т "%s"?'; - $lang['strreportneedsname'] = 'Вам необх╕дно вказати ╕м"я зв╕ту.'; - $lang['strreportneedsdef'] = 'Вам необх╕дно вказати SQL-запит для Вашого зв╕ту.'; - $lang['strreportcreated'] = 'Зв╕т збережено.'; - $lang['strreportcreatedbad'] = 'Збереження зв╕ту перервано.'; // Domains $lang['strdomain'] = 'Домен'; diff --git a/reports.php b/reports.php deleted file mode 100644 index c750f95c..00000000 --- a/reports.php +++ /dev/null @@ -1,435 +0,0 @@ -getReport($_REQUEST['report_id']); - if ($_REQUEST['action'] == 'edit') { - $_POST['report_name'] = $report->fields['report_name']; - $_POST['db_name'] = $report->fields['db_name']; - $_POST['descr'] = $report->fields['descr']; - $_POST['report_sql'] = $report->fields['report_sql']; - if ($report->fields['paginate'] == 't') { - $_POST['paginate'] = TRUE; - } - } - - // Get a list of available databases - $databases = $data->getDatabases(); - - $_REQUEST['report'] = $report->fields['report_name']; - $misc->printTrail('report'); - $misc->printTitle($lang['stredit']); - $misc->printMsg($msg); - - echo "
\n"; - echo $misc->form; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
{$lang['strname']}_maxNameLen}\" value=\"", - htmlspecialchars($_POST['report_name']), "\" />
{$lang['strdatabase']}
{$lang['strcomment']}
{$lang['strsql']}
\n"; - echo "\n"; - echo "

\n"; - echo "\n"; - echo "

\n"; - echo "fields['report_id']}\" />\n"; - echo "
\n"; - } - - /** - * Saves changes to a report - */ - function doSaveEdit() { - global $reportsdb, $lang; - - if (!isset($_POST['report_name'])) $_POST['report_name'] = ''; - if (!isset($_POST['db_name'])) $_POST['db_name'] = ''; - if (!isset($_POST['descr'])) $_POST['descr'] = ''; - if (!isset($_POST['report_sql'])) $_POST['report_sql'] = ''; - - // Check that they've given a name and a definition - if ($_POST['report_name'] == '') doEdit($lang['strreportneedsname']); - elseif ($_POST['report_sql'] == '') doEdit($lang['strreportneedsdef']); - else { - $status = $reportsdb->alterReport($_POST['report_id'], $_POST['report_name'], $_POST['db_name'], - $_POST['descr'], $_POST['report_sql'], isset($_POST['paginate'])); - if ($status == 0) - doDefault($lang['strreportcreated']); - else - doEdit($lang['strreportcreatedbad']); - } - } - - /** - * Display read-only properties of a report - */ - function doProperties($msg = '') { - global $data, $reportsdb, $misc; - global $lang; - - $report = $reportsdb->getReport($_REQUEST['report_id']); - - $_REQUEST['report'] = $report->fields['report_name']; - $misc->printTrail('report'); - $misc->printTitle($lang['strproperties']); - $misc->printMsg($msg); - - if ($report->recordCount() == 1) { - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
{$lang['strname']}", $misc->printVal($report->fields['report_name']), "
{$lang['strdatabase']}", $misc->printVal($report->fields['db_name']), "
{$lang['strcomment']}", $misc->printVal($report->fields['descr']), "
{$lang['strpaginate']}", $misc->printVal($report->fields['paginate'], 'yesno', array('align' => 'left')), "
{$lang['strsql']}", $misc->printVal($report->fields['report_sql']), "
\n"; - } - else echo "

{$lang['strinvalidparam']}

\n"; - - $urlvars = array ('server' => $_REQUEST['server']); - if (isset($_REQUEST['schema'])) $urlvars['schema'] = $_REQUEST['schema']; - if (isset($_REQUEST['database'])) $urlvars['database'] = $_REQUEST['database']; - - $navlinks = array ( - 'showall' => array ( - 'attr'=> array ( - 'href' => array ( - 'url' => 'reports.php', - 'urlvars' => $urlvars - ) - ), - 'content' => $lang['strshowallreports'] - ), - 'alter' => array ( - 'attr'=> array ( - 'href' => array ( - 'url' => 'reports.php', - 'urlvars' => array_merge($urlvars, array( - 'action' => 'edit', - 'report_id' => $report->fields['report_id'] - )) - ) - ), - 'content' => $lang['stredit'] - ), - 'exec' => array ( - 'attr'=> array ( - 'href' => array ( - 'url' => 'sql.php', - 'urlvars' => array_merge($urlvars, array( - 'subject' => 'report', - 'report' => $report->fields['report_name'], - 'return' => 'report', - 'database' => $report->fields['db_name'], - 'reportid' => $report->fields['report_id'], - 'paginate' => $report->fields['paginate'] - )) - ) - ), - 'content' => $lang['strexecute'] - ) - ); - $misc->printNavLinks($navlinks, 'reports-properties'); - } - - /** - * Displays a screen where they can enter a new report - */ - function doCreate($msg = '') { - global $data, $reportsdb, $misc; - global $lang; - - if (!isset($_REQUEST['report_name'])) $_REQUEST['report_name'] = ''; - if (!isset($_REQUEST['db_name'])) $_REQUEST['db_name'] = ''; - if (!isset($_REQUEST['descr'])) $_REQUEST['descr'] = ''; - if (!isset($_REQUEST['report_sql'])) $_REQUEST['report_sql'] = ''; - - if (isset($_REQUEST['database'])) { - $_REQUEST['db_name'] = $_REQUEST['database']; - unset($_REQUEST['database']); - $misc->setForm(); - } - - $databases = $data->getDatabases(); - - $misc->printTrail('server'); - $misc->printTitle($lang['strcreatereport']); - $misc->printMsg($msg); - - echo "
\n"; - echo $misc->form; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
{$lang['strname']}_maxNameLen}\" value=\"", - htmlspecialchars($_REQUEST['report_name']), "\" />
{$lang['strdatabase']}
{$lang['strcomment']}
{$lang['strsql']}
\n"; - echo "\n"; - echo "

\n"; - echo "\n"; - echo "

\n"; - echo "
\n"; - } - - /** - * Actually creates the new report in the database - */ - function doSaveCreate() { - global $reportsdb, $lang; - - if (!isset($_POST['report_name'])) $_POST['report_name'] = ''; - if (!isset($_POST['db_name'])) $_POST['db_name'] = ''; - if (!isset($_POST['descr'])) $_POST['descr'] = ''; - if (!isset($_POST['report_sql'])) $_POST['report_sql'] = ''; - - // Check that they've given a name and a definition - if ($_POST['report_name'] == '') doCreate($lang['strreportneedsname']); - elseif ($_POST['report_sql'] == '') doCreate($lang['strreportneedsdef']); - else { - $status = $reportsdb->createReport($_POST['report_name'], $_POST['db_name'], - $_POST['descr'], $_POST['report_sql'], isset($_POST['paginate'])); - if ($status == 0) - doDefault($lang['strreportcreated']); - else - doCreate($lang['strreportcreatedbad']); - } - } - - /** - * Show confirmation of drop and perform actual drop - */ - function doDrop($confirm) { - global $reportsdb, $misc; - global $lang; - - if ($confirm) { - // Fetch report from the database - $report = $reportsdb->getReport($_REQUEST['report_id']); - - $_REQUEST['report'] = $report->fields['report_name']; - $misc->printTrail('report'); - $misc->printTitle($lang['strdrop']); - - echo "

", sprintf($lang['strconfdropreport'], $misc->printVal($report->fields['report_name'])), "

\n"; - - echo "
\n"; - echo $misc->form; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - } - else { - $status = $reportsdb->dropReport($_POST['report_id']); - if ($status == 0) - doDefault($lang['strreportdropped']); - else - doDefault($lang['strreportdroppedbad']); - } - } - - /** - * Show default list of reports in the database - */ - function doDefault($msg = '') { - global $data, $misc, $reportsdb; - global $lang; - - $misc->printTrail('server'); - $misc->printTabs('server','reports'); - $misc->printMsg($msg); - - $reports = $reportsdb->getReports(); - - $columns = array( - 'report' => array( - 'title' => $lang['strreport'], - 'field' => field('report_name'), - 'url' => "reports.php?action=properties&{$misc->href}&", - 'vars' => array('report_id' => 'report_id'), - ), - 'database' => array( - 'title' => $lang['strdatabase'], - 'field' => field('db_name'), - ), - 'created' => array( - 'title' => $lang['strcreated'], - 'field' => field('date_created'), - ), - 'paginate' => array( - 'title' => $lang['strpaginate'], - 'field' => field('paginate'), - 'type' => 'yesno', - ), - 'actions' => array( - 'title' => $lang['stractions'], - ), - 'comment' => array( - 'title' => $lang['strcomment'], - 'field' => field('descr'), - ), - ); - - $actions = array( - 'run' => array( - 'content' => $lang['strexecute'], - 'attr'=> array ( - 'href' => array ( - 'url' => 'sql.php', - 'urlvars' => array ( - 'subject' => 'report', - 'return' => 'report', - 'report' => field('report_name'), - 'database' => field('db_name'), - 'reportid' => field('report_id'), - 'paginate' => field('paginate') - ) - ) - ) - ), - 'edit' => array( - 'content' => $lang['stredit'], - 'attr'=> array ( - 'href' => array ( - 'url' => 'reports.php', - 'urlvars' => array ( - 'action' => 'edit', - 'report_id' => field('report_id') - ) - ) - ) - ), - 'drop' => array( - 'content' => $lang['strdrop'], - 'attr'=> array ( - 'href' => array ( - 'url' => 'reports.php', - 'urlvars' => array ( - 'action' => 'confirm_drop', - 'report_id' => field('report_id') - ) - ) - ) - ), - ); - - $misc->printTable($reports, $columns, $actions, 'reports-reports', $lang['strnoreports']); - - $urlvars = array ('server' => $_REQUEST['server']); - if (isset($_REQUEST['database'])) $urlvars['database'] = $_REQUEST['database']; - if (isset($_REQUEST['schema'])) $urlvars['schema'] = $_REQUEST['schema']; - - $misc->printNavLinks(array ( - 'create' => array ( - 'attr'=> array ( - 'href' => array ( - 'url' => 'reports.php', - 'urlvars' => array_merge(array ( - 'action' => 'create' - ), $urlvars) - ) - ), - 'content' => $lang['strcreatereport'] - )), 'reports-reports' - ); - } - - $misc->printHeader($lang['strreports']); - $misc->printBody(); - - // Create a database accessor for the reports database - include_once('./classes/Reports.php'); - $reportsdb = new Reports($status); - if ($status != 0) { - $misc->printTrail('server'); - $misc->printTabs('server','reports'); - $misc->printMsg($lang['strnoreportsdb']); - } - else { - switch ($action) { - case 'save_edit': - if (isset($_POST['cancel'])) doDefault(); - else doSaveEdit(); - break; - case 'edit': - doEdit(); - break; - case 'properties': - doProperties(); - break; - case 'save_create': - if (isset($_POST['cancel'])) doDefault(); - else doSaveCreate(); - break; - case 'create': - doCreate(); - break; - case 'drop': - if (isset($_POST['drop'])) doDrop(false); - else doDefault(); - break; - case 'confirm_drop': - doDrop(true); - break; - default: - doDefault(); - break; - } - } - - $misc->printFooter(); - -?> diff --git a/sql.php b/sql.php index f69c2806..d2364fba 100644 --- a/sql.php +++ b/sql.php @@ -72,15 +72,7 @@ // We need to store the query in a session for editing purposes // We avoid GPC vars to avoid truncating long queries - // If we came from a report, we need to look up the query - if (isset($_REQUEST['subject']) && $_REQUEST['subject'] == 'report' ) { - global $data, $misc; - include_once('./classes/Reports.php'); - $reportsdb = new Reports($status); - $report = $reportsdb->getReport($_REQUEST['reportid']); - $_SESSION['sqlquery'] = $report->fields['report_sql']; - } - elseif (isset($_REQUEST['subject']) && $_REQUEST['subject'] == 'history') { + if (isset($_REQUEST['subject']) && $_REQUEST['subject'] == 'history') { // Or maybe we came from the history popup $_SESSION['sqlquery'] = $_SESSION['history'][$_REQUEST['server']][$_REQUEST['database']][$_GET['queryid']]['query']; } @@ -232,22 +224,6 @@ 'content' => $lang['streditsql'] ); - // Create report - if (($subject !== 'report') && $conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) { - $navlinks['createreport'] = array ( - 'attr'=> array ( - 'href' => array ( - 'url' => 'reports.php', - 'urlvars' => array_merge($fields, array ( - 'action' => 'create', - 'report_sql' => $_SESSION['sqlquery'] - )) - ) - ), - 'content' => $lang['strcreatereport'] - ); - } - // Create view and download if (isset($_SESSION['sqlquery']) && isset($rs) && is_object($rs) && $rs->recordCount() > 0) { // Report views don't set a schema, so we need to disable create view in that case diff --git a/sql/reports-pgsql.sql b/sql/reports-pgsql.sql deleted file mode 100644 index 1272a762..00000000 --- a/sql/reports-pgsql.sql +++ /dev/null @@ -1,27 +0,0 @@ --- SQL script to create reports database for PostgreSQL --- --- To run, type: psql template1 < reports-pgsql.sql --- --- $Id: reports-pgsql.sql,v 1.4 2007/04/16 11:02:36 mr-russ Exp $ - -CREATE DATABASE phppgadmin; - -\connect phppgadmin - -CREATE TABLE ppa_reports ( - report_id SERIAL, - report_name varchar(255) NOT NULL, - db_name varchar(255) NOT NULL, - date_created date DEFAULT NOW() NOT NULL, - created_by varchar(255) NOT NULL, - descr text, - report_sql text NOT NULL, - paginate boolean NOT NULL, - PRIMARY KEY (report_id) -); - --- Allow everyone to do everything with reports. This may --- or may not be what you want. -GRANT SELECT,INSERT,UPDATE,DELETE ON ppa_reports TO PUBLIC; -GRANT SELECT,UPDATE ON ppa_reports_report_id_seq TO PUBLIC; -