Skip to content
Browse files

Deleted references to smarty that were not necessary anymore

  • Loading branch information...
1 parent d754160 commit 2bc03f1d231e113ff1f9b3f697a30f87df35ed51 @soonick committed Mar 24, 2012
View
0 cache/pommo/smarty/index.php
No changes.
View
41 classes/Pommo.php
@@ -180,47 +180,6 @@ public static function preInit($baseDir)
require_once(self::$_baseDir.'classes/Pommo_Helper_L10n.php');
Pommo_Helper_L10n::init(self::$_language, self::$_baseDir);
}
-
- // make sure workDir is writable
- if (!is_dir(self::$_workDir.'/pommo/smarty'))
- {
-
- $wd = self::$_workDir;
- self::$_workDir = null;
- if (!is_dir($wd))
- {
- Pommo::kill(sprintf(Pommo::_T('Work Directory (%s) not found!
- Make sure it exists and the webserver can write to it.
- You can change its location from the config.php file.'),
- $wd));
- }
- if (!is_writable($wd))
- {
- Pommo::kill(sprintf(Pommo::_T('Cannot write to Work Directory
- (%s). Make sure it has the proper permissions.'), $wd));
- }
- if ('1' == ini_get('safe_mode'))
- {
- Pommo::kill(sprintf(Pommo::_T('Working Directory (%s) cannot be
- created under PHP SAFE MODE. See Documentation, or
- disable SAFE MODE.'), $wd));
- }
- if (!is_dir($wd.'/pommo'))
- {
- if (!mkdir($wd.'/pommo'))
- {
- Pommo::kill(Pommo::_T('Could not create directory').' '.
- $wd.'/pommo');
- }
- }
-
- if (!mkdir($wd.'/pommo/smarty'))
- {
- Pommo::kill(Pommo::_T('Could not create directory').' '.$wd.
- '/pommo/smarty');
- }
- self::$_workdir = $wd;
- }
// set the current "section" -- should be "user" for /user/* files,
// "mailings" for /admin/mailings/* files, etc. etc.
View
24 classes/Pommo_Template.php
@@ -28,17 +28,11 @@ function Pommo_Template()
// set theme -- TODO; extend this to the theme selector
$this->_pommoTheme = 'default';
- // set smarty directories
+ // set directories
$this->_themeDir = Pommo::$_baseDir . 'themes/';
$this->template_dir = $this->_themeDir . $this->_pommoTheme;
$this->config_dir = $this->template_dir . '/inc/config';
- $this->cache_dir = Pommo::$_workDir . '/pommo/smarty';
- $this->compile_dir = Pommo::$_workDir . '/pommo/smarty';
- $this->plugins_dir = array (
- 'plugins', // the default under SMARTY_DIR
- Pommo::$_baseDir . 'lib/smarty-plugins/gettext',
- Pommo::$_baseDir . 'lib/smarty-plugins/pommo');
-
+
// set base/core variables available to all template
$this->assign('url', array (
'theme' => array (
@@ -176,20 +170,6 @@ function prepareForSubscribeForm()
$this->assign($_POST);
}
-
- // returns an array of invalid fields, empty if none.
- // array key == invalid field, value == message
- // e.g. array(field => 'email', 'message' => 'Must be an Email Address');
- function getInvalidFields($form = SMARTY_VALIDATE_DEFAULT_FORM) {
- $o = array();
-
- foreach($_SESSION['SmartyValidate'][$form]['validators'] as $validator) {
- if(!$validator['valid'])
- array_push($o,array('field' => $validator['field'], 'message' => $validator['message']));
- }
-
- return $o;
- }
/**
* escape
View
2 docs/DEVELOPERS
@@ -38,7 +38,7 @@ pommo/admin/*/ajax/
pommo/cache/
"Work directory" - web disabled (no URL's point here)
- This is the default working directory, if not explicitly defined in config.php. This directory should be writable by the webserver. SMARTY compiles and caches its templates in this directory.
+ This is the default working directory, if not explicitly defined in config.php. This directory should be writable by the webserver.
pommo/docs/
View
4 login.php
@@ -33,7 +33,7 @@
$logger = Pommo::$_logger;
$dbo = Pommo::$_dbo;
-session_start(); // required by smartyValidate. TODO -> verify if needed
+session_start();
/**********************************
SETUP TEMPLATE, PAGE
@@ -64,12 +64,10 @@
{
if (Pommo_Pending::isEmailPending($_POST['Email'])) {
$input = urlencode(serialize(array('Email' => $_POST['Email'])));
- SmartyValidate :: disconnect();
Pommo::redirect('pending.php?input='.$input);
}
else {
// __ EMAIL IN SUBSCRIBERS TABLE, REDIRECT
- SmartyValidate :: disconnect();
Pommo::redirect('activate.php?email='.$_POST['Email']);
}
}
View
19 themes/default/inc/config/example.conf
@@ -1,19 +0,0 @@
-#Example config file
-# Config file(s) can be included in your template via;
-# {config_load file="example.conf"}
-# (where "example.conf" is the name of the config file in this directory
-# You can load specific section variables via;
-# {config_load file='example.conf' section='Customer'}
-#
-# The below variables can be accessed via {$pageTitle}, etc.
-# See http://smarty.php.net/manual/en/config.files.php for more info
-
-# global variables
-pageTitle = "Main Menu"
-bodyBgColor = #000000
-tableBgColor = #000000
-rowBgColor = #00ff00
-
-#customer variables section
-[Customer]
-pageTitle = "Customer Info"

0 comments on commit 2bc03f1

Please sign in to comment.
Something went wrong with that request. Please try again.